merge from the expermental2 branch

326 files changed, 53402 insertions, 43469 deletions

diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
index 9c55498ce..c33445b56 100644
--- a/.bzr-builddeb/default.conf
+++ b/.bzr-builddeb/default.conf
@@ -1,2 +1,6 @@
 [BUILDDEB]
 native = true
+
+[HOOKS]
+pre-export = ./prepare-release pre-export
+post-build = ./prepare-release post-build
diff --git a/.bzrignore b/.bzrignore
index 7c4b11b10..dab38cf71 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -10,6 +10,8 @@ build/
 configure
 buildlib/config.sub
 buildlib/config.guess
+debian/libapt-pkg[0-9]*.install
+debian/libapt-inst[0-9]*.install
 
 # abichecker related files/dir
 abicheck/apt_build.xml
diff --git a/Makefile b/Makefile
index 9a47014c3..aa8160ac0 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@ endif
 .PHONY: default
 default: startup all
 
-.PHONY: headers library clean veryclean all binary program doc test
-all headers library clean veryclean binary program doc dirs test:
+.PHONY: headers library clean veryclean all binary program doc test update-po
+startup all headers library clean veryclean binary program doc dirs test update-po:
 	$(MAKE) -C apt-pkg $@
 	$(MAKE) -C apt-inst $@
 	$(MAKE) -C methods $@
@@ -21,6 +21,8 @@ all headers library clean veryclean binary program doc dirs test:
 	$(MAKE) -C po $@
 	$(MAKE) -C test $@
 
+update-po: startup
+
 # Some very common aliases
 .PHONY: maintainer-clean dist-clean distclean pristine sanity 
 maintainer-clean dist-clean distclean pristine sanity: veryclean
diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc
index 8018f4d30..2dee1a40d 100644
--- a/apt-inst/contrib/arfile.cc
+++ b/apt-inst/contrib/arfile.cc
@@ -14,13 +14,17 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/arfile.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 
 #include <stdlib.h>
-									/*}}}*/
+
 #include <apti18n.h>
+									/*}}}*/
 
 struct ARArchive::MemberHeader
 {
@@ -112,7 +116,7 @@ bool ARArchive::LoadHeaders()
       {
 	 unsigned int I = sizeof(Head.Name) - 1;
 	 for (; Head.Name[I] == ' ' || Head.Name[I] == '/'; I--);
-	 Memb->Name = string(Head.Name,I+1);
+	 Memb->Name = std::string(Head.Name,I+1);
       }
 
       // Account for the AR header alignment 
diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h
index 7f6c68302..0f62a34a0 100644
--- a/apt-inst/contrib/arfile.h
+++ b/apt-inst/contrib/arfile.h
@@ -17,7 +17,11 @@
 
 
 #include <string>
+#ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/fileutl.h>
+#endif
+
+class FileFd;
 
 class ARArchive
 {
@@ -49,12 +53,12 @@ class ARArchive
 struct ARArchive::Member
 {
    // Fields from the header
-   string Name;
+   std::string Name;
    unsigned long MTime;
    unsigned long UID;
    unsigned long GID;
    unsigned long Mode;
-   unsigned long Size;
+   unsigned long long Size;
    
    // Location of the data.
    unsigned long Start;
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 01b6b3836..12919a7cd 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -16,8 +16,10 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <apt-pkg/extracttar.h>
+#include<config.h>
 
+#include <apt-pkg/dirstream.h>
+#include <apt-pkg/extracttar.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
@@ -28,6 +30,7 @@
 #include <signal.h>
 #include <fcntl.h>
 #include <iostream>
+
 #include <apti18n.h>
 									/*}}}*/
 
diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h
index 42f8ef534..4b29df314 100644
--- a/apt-inst/contrib/extracttar.h
+++ b/apt-inst/contrib/extracttar.h
@@ -15,11 +15,16 @@
 #define PKGLIB_EXTRACTTAR_H
 
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/dirstream.h>
 
-#include <algorithm>
+#include <string>
 
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/dirstream.h>
+#include <algorithm>
 using std::min;
+#endif
+
+class pkgDirStream;
 
 class ExtractTar
 {
@@ -38,7 +43,7 @@ class ExtractTar
    int GZPid;
    FileFd InFd;
    bool Eof;
-   string DecompressProg;
+   std::string DecompressProg;
    
    // Fork and reap gzip
    bool StartGzip();
@@ -48,7 +53,7 @@ class ExtractTar
 
    bool Go(pkgDirStream &Stream);
    
-   ExtractTar(FileFd &Fd,unsigned long Max,string DecompressionProgram);
+   ExtractTar(FileFd &Fd,unsigned long Max,std::string DecompressionProgram);
    virtual ~ExtractTar();
 };
 
diff --git a/apt-inst/database.cc b/apt-inst/database.cc
deleted file mode 100644
index a5020f3d7..000000000
--- a/apt-inst/database.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- mode: cpp; mode: fold -*-
-// Description								/*{{{*/
-// $Id: database.cc,v 1.2 2001/02/20 07:03:16 jgg Exp $
-/* ######################################################################
-
-   Data Base Abstraction
-   
-   ##################################################################### */
-									/*}}}*/
-// Include Files							/*{{{*/
-#include <apt-pkg/database.h>
-									/*}}}*/
-
-// DataBase::GetMetaTmp - Get the temp dir				/*{{{*/
-// ---------------------------------------------------------------------
-/* This re-initializes the meta temporary directory if it hasn't yet 
-   been inited for this cycle. The flag is the emptyness of MetaDir */
-bool pkgDataBase::GetMetaTmp(string &Dir)
-{
-   if (MetaDir.empty() == true)
-      if (InitMetaTmp(MetaDir) == false)
-	 return false;
-   Dir = MetaDir;
-   return true;
-}
-									/*}}}*/
diff --git a/apt-inst/database.h b/apt-inst/database.h
deleted file mode 100644
index ef45bc2d6..000000000
--- a/apt-inst/database.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- mode: cpp; mode: fold -*-
-// Description								/*{{{*/
-// $Id: database.h,v 1.2 2001/02/20 07:03:16 jgg Exp $
-/* ######################################################################
-
-   Data Base Abstraction
-   
-   This class provides a simple interface to an abstract notion of a 
-   database directory for storing state information about the system.
-
-   The 'Meta' information for a package is the control information and
-   setup scripts stored inside the archive. GetMetaTmp returns the name of
-   a directory that is used to store named files containing the control
-   information. 
-   
-   The File Listing is the database of installed files. It is loaded 
-   into the memory/persistent cache structure by the ReadFileList method.  
-   
-   ##################################################################### */
-									/*}}}*/
-#ifndef PKGLIB_DATABASE_H
-#define PKGLIB_DATABASE_H
-
-#include <apt-pkg/filelist.h>
-#include <apt-pkg/pkgcachegen.h>
-
-class pkgDataBase
-{
-   protected:
-   
-   pkgCacheGenerator *Cache;
-   pkgFLCache *FList;
-   string MetaDir;
-   virtual bool InitMetaTmp(string &Dir) = 0;
-   
-   public:
-
-   // Some manipulators for the cache and generator
-   inline pkgCache &GetCache() {return Cache->GetCache();};
-   inline pkgFLCache &GetFLCache() {return *FList;};
-   inline pkgCacheGenerator &GetGenerator() {return *Cache;};
-   
-   bool GetMetaTmp(string &Dir);
-   virtual bool ReadyFileList(OpProgress &Progress) = 0;
-   virtual bool ReadyPkgCache(OpProgress &Progress) = 0;
-   virtual bool LoadChanges() = 0;
-
-   pkgDataBase() : Cache(0), FList(0) {};
-   virtual ~pkgDataBase() {delete Cache; delete FList;};
-};
-
-#endif
diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc
index a40cd1ae8..ab4037915 100644
--- a/apt-inst/deb/debfile.cc
+++ b/apt-inst/deb/debfile.cc
@@ -16,6 +16,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/debfile.h>
 #include <apt-pkg/extracttar.h>
 #include <apt-pkg/error.h>
@@ -87,42 +89,6 @@ const ARArchive::Member *debDebFile::GotoMember(const char *Name)
    return Member;
 }
 									/*}}}*/
-// DebFile::ExtractControl - Extract Control information		/*{{{*/
-// ---------------------------------------------------------------------
-/* Extract the control information into the Database's temporary 
-   directory. */
-bool debDebFile::ExtractControl(pkgDataBase &DB)
-{
-   // Get the archive member and positition the file
-   const ARArchive::Member *Member = GotoMember("control.tar.gz");
-   if (Member == 0)
-      return false;
-      
-   // Prepare Tar
-   ControlExtract Extract;
-   ExtractTar Tar(File,Member->Size,"gzip");
-   if (_error->PendingError() == true)
-      return false;
-   
-   // Get into the temporary directory
-   string Cwd = SafeGetCWD();
-   string Tmp;
-   if (DB.GetMetaTmp(Tmp) == false)
-      return false;
-   if (chdir(Tmp.c_str()) != 0)
-      return _error->Errno("chdir",_("Couldn't change to %s"),Tmp.c_str());
-   
-   // Do extraction
-   if (Tar.Go(Extract) == false)
-      return false;
-   
-   // Switch out of the tmp directory.
-   if (chdir(Cwd.c_str()) != 0)
-      chdir("/");
-   
-   return true;
-}
-									/*}}}*/
 // DebFile::ExtractArchive - Extract the archive data itself		/*{{{*/
 // ---------------------------------------------------------------------
 /* Simple wrapper around tar.. */
@@ -164,32 +130,6 @@ bool debDebFile::ExtractArchive(pkgDirStream &Stream)
    return Tar.Go(Stream);
 }
 									/*}}}*/
-// DebFile::MergeControl - Merge the control information		/*{{{*/
-// ---------------------------------------------------------------------
-/* This reads the extracted control file into the cache and returns the
-   version that was parsed. All this really does is select the correct
-   parser and correct file to parse. */
-pkgCache::VerIterator debDebFile::MergeControl(pkgDataBase &DB)
-{
-   // Open the control file
-   string Tmp;
-   if (DB.GetMetaTmp(Tmp) == false)
-      return pkgCache::VerIterator(DB.GetCache());
-   FileFd Fd(Tmp + "control",FileFd::ReadOnly);
-   if (_error->PendingError() == true)
-      return pkgCache::VerIterator(DB.GetCache());
-   
-   // Parse it
-   debListParser Parse(&Fd);
-   pkgCache::VerIterator Ver(DB.GetCache());
-   if (DB.GetGenerator().MergeList(Parse,&Ver) == false)
-      return pkgCache::VerIterator(DB.GetCache());
-   
-   if (Ver.end() == true)
-      _error->Error(_("Failed to locate a valid control file"));
-   return Ver;
-}
-									/*}}}*/
 
 // DebFile::ControlExtract::DoItem - Control Tar Extraction		/*{{{*/
 // ---------------------------------------------------------------------
diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h
index 6b9f8ffc8..d94b74446 100644
--- a/apt-inst/deb/debfile.h
+++ b/apt-inst/deb/debfile.h
@@ -25,9 +25,11 @@
 
 
 #include <apt-pkg/arfile.h>
-#include <apt-pkg/database.h>
 #include <apt-pkg/dirstream.h>
 #include <apt-pkg/tagfile.h>
+#include <apt-pkg/pkgcache.h>
+
+class FileFd;
 
 class debDebFile
 {
@@ -39,13 +41,10 @@ class debDebFile
    bool CheckMember(const char *Name);
    
    public:
-
    class ControlExtract;
    class MemControlExtract;
-   
-   bool ExtractControl(pkgDataBase &DB);
+
    bool ExtractArchive(pkgDirStream &Stream);
-   pkgCache::VerIterator MergeControl(pkgDataBase &DB);
    const ARArchive::Member *GotoMember(const char *Name);
    inline FileFd &GetFile() {return File;};
    
@@ -68,7 +67,7 @@ class debDebFile::MemControlExtract : public pkgDirStream
    char *Control;
    pkgTagSection Section;
    unsigned long Length;
-   string Member;
+   std::string Member;
    
    // Members from DirStream
    virtual bool DoItem(Item &Itm,int &Fd);
@@ -81,7 +80,7 @@ class debDebFile::MemControlExtract : public pkgDirStream
    bool TakeControl(const void *Data,unsigned long Size);
       
    MemControlExtract() : IsControl(false), Control(0), Length(0), Member("control") {};
-   MemControlExtract(string Member) : IsControl(false), Control(0), Length(0), Member(Member) {};
+   MemControlExtract(std::string Member) : IsControl(false), Control(0), Length(0), Member(Member) {};
    ~MemControlExtract() {delete [] Control;};   
 };
 									/*}}}*/
diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc
deleted file mode 100644
index a75cf59ca..000000000
--- a/apt-inst/deb/dpkgdb.cc
+++ /dev/null
@@ -1,490 +0,0 @@
-// -*- mode: cpp; mode: fold -*-
-// Description								/*{{{*/
-// $Id: dpkgdb.cc,v 1.7.2.1 2004/01/16 18:58:50 mdz Exp $
-/* ######################################################################
-
-   DPKGv1 Database Implemenation
-   
-   This class provides parsers and other implementations for the DPKGv1
-   database. It reads the diversion file, the list files and the status
-   file to build both the list of currently installed files and the 
-   currently installed package list.
-   
-   ##################################################################### */
-									/*}}}*/
-// Include Files							/*{{{*/
-#include <apt-pkg/dpkgdb.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/error.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/tagfile.h>
-#include <apt-pkg/strutl.h>
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <iostream>
-#include <apti18n.h>
-									/*}}}*/
-using namespace std;
-
-// EraseDir - Erase A Directory						/*{{{*/
-// ---------------------------------------------------------------------
-/* This is necessary to create a new empty sub directory. The caller should
-   invoke mkdir after this with the proper permissions and check for 
-   error. Maybe stick this in fileutils */
-static bool EraseDir(const char *Dir)
-{
-   // First we try a simple RM
-   if (rmdir(Dir) == 0 ||
-       errno == ENOENT)
-      return true;
-   
-   // A file? Easy enough..
-   if (errno == ENOTDIR)
-   {
-      if (unlink(Dir) != 0)
-	 return _error->Errno("unlink",_("Failed to remove %s"),Dir);
-      return true;
-   }
-   
-   // Should not happen
-   if (errno != ENOTEMPTY)
-      return _error->Errno("rmdir",_("Failed to remove %s"),Dir);
-   
-   // Purge it using rm
-   pid_t Pid = ExecFork();
-
-   // Spawn the subprocess
-   if (Pid == 0)
-   {
-      execlp(_config->Find("Dir::Bin::rm","/bin/rm").c_str(),
-	     "rm","-rf","--",Dir,(char *)NULL);
-      _exit(100);
-   }
-   return ExecWait(Pid,_config->Find("dir::bin::rm","/bin/rm").c_str());
-}
-									/*}}}*/
-// DpkgDB::debDpkgDB - Constructor					/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-debDpkgDB::debDpkgDB() : CacheMap(0), FileMap(0)
-{
-   AdminDir = flNotFile(_config->Find("Dir::State::status"));   
-   DiverInode = 0;
-   DiverTime = 0;
-}
-									/*}}}*/
-// DpkgDB::~debDpkgDB - Destructor					/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-debDpkgDB::~debDpkgDB()
-{
-   delete Cache;
-   Cache = 0;
-   delete CacheMap;
-   CacheMap = 0;
-   
-   delete FList;
-   FList = 0;
-   delete FileMap;
-   FileMap = 0;
-}
-									/*}}}*/
-// DpkgDB::InitMetaTmp - Get the temp dir for meta information		/*{{{*/
-// ---------------------------------------------------------------------
-/* This creats+empties the meta temporary directory /var/lib/dpkg/tmp.ci
-   Only one package at a time can be using the returned meta directory. */
-bool debDpkgDB::InitMetaTmp(string &Dir)
-{
-   string Tmp = AdminDir + "tmp.ci/";
-   if (EraseDir(Tmp.c_str()) == false)
-      return _error->Error(_("Unable to create %s"),Tmp.c_str());
-   if (mkdir(Tmp.c_str(),0755) != 0)
-      return _error->Errno("mkdir",_("Unable to create %s"),Tmp.c_str());
-   
-   // Verify it is on the same filesystem as the main info directory
-   dev_t Dev;
-   struct stat St;
-   if (stat((AdminDir + "info").c_str(),&St) != 0)
-      return _error->Errno("stat",_("Failed to stat %sinfo"),AdminDir.c_str());
-   Dev = St.st_dev;
-   if (stat(Tmp.c_str(),&St) != 0)
-      return _error->Errno("stat",_("Failed to stat %s"),Tmp.c_str());
-   if (Dev != St.st_dev)
-      return _error->Error(_("The info and temp directories need to be on the same filesystem"));
-   
-   // Done
-   Dir = Tmp;
-   return true;
-}
-									/*}}}*/
-// DpkgDB::ReadyPkgCache - Prepare the cache with the current status	/*{{{*/
-// ---------------------------------------------------------------------
-/* This reads in the status file into an empty cache. This really needs 
-   to be somehow unified with the high level APT notion of the Database
-   directory, but there is no clear way on how to do that yet. */
-bool debDpkgDB::ReadyPkgCache(OpProgress &Progress)
-{
-   if (Cache != 0)
-   {  
-      Progress.OverallProgress(1,1,1,_("Reading package lists"));      
-      return true;
-   }
-   
-   if (CacheMap != 0)
-   {
-      delete CacheMap;
-      CacheMap = 0;
-   }
-   
-   if (pkgCacheGenerator::MakeOnlyStatusCache(&Progress,&CacheMap) == false)
-      return false;
-   Cache->DropProgress();
-   
-   return true;
-}
-									/*}}}*/
-// DpkgDB::ReadFList - Read the File Listings in 			/*{{{*/
-// ---------------------------------------------------------------------
-/* This reads the file listing in from the state directory. This is a 
-   performance critical routine, as it needs to parse about 50k lines of
-   text spread over a hundred or more files. For an initial cold start
-   most of the time is spent in reading file inodes and so on, not 
-   actually parsing. */
-bool debDpkgDB::ReadFList(OpProgress &Progress)
-{
-   // Count the number of packages we need to read information for
-   unsigned long Total = 0;
-   pkgCache &Cache = this->Cache->GetCache();
-   for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
-   {
-      // Only not installed packages have no files.
-      if (I->CurrentState == pkgCache::State::NotInstalled)
-	 continue;
-      Total++;
-   }
-
-   /* Switch into the admin dir, this prevents useless lookups for the 
-      path components */
-   string Cwd = SafeGetCWD();
-   if (chdir((AdminDir + "info/").c_str()) != 0)
-      return _error->Errno("chdir",_("Failed to change to the admin dir %sinfo"),AdminDir.c_str());
-   
-   // Allocate a buffer. Anything larger than this buffer will be mmaped
-   unsigned long BufSize = 32*1024;
-   char *Buffer = new char[BufSize];
-
-   // Begin Loading them
-   unsigned long Count = 0;
-   char Name[300];
-   for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
-   {
-      /* Only not installed packages have no files. ConfFile packages have
-         file lists but we don't want to read them in */
-      if (I->CurrentState == pkgCache::State::NotInstalled ||
-	  I->CurrentState == pkgCache::State::ConfigFiles)
-	 continue;
-
-      // Fetch a package handle to associate with the file
-      pkgFLCache::PkgIterator FlPkg = FList->GetPkg(I.Name(),0,true);
-      if (FlPkg.end() == true)
-      {
-	 _error->Error(_("Internal error getting a package name"));
-	 break;
-      }
-      
-      Progress.OverallProgress(Count,Total,1,_("Reading file listing"));
-     
-      // Open the list file
-      snprintf(Name,sizeof(Name),"%s.list",I.Name());
-      int Fd = open(Name,O_RDONLY);
-      
-      /* Okay this is very strange and bad.. Best thing is to bail and
-         instruct the user to look into it. */
-      struct stat Stat;
-      if (Fd == -1 || fstat(Fd,&Stat) != 0)
-      {
-	 _error->Errno("open",_("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!"),
-		       AdminDir.c_str(),Name);
-	 break;
-      }
-      
-      // Set File to be a memory buffer containing the whole file
-      char *File;
-      if ((unsigned)Stat.st_size < BufSize)
-      {
-	 if (read(Fd,Buffer,Stat.st_size) != Stat.st_size)
-	 {
-	    _error->Errno("read",_("Failed reading the list file %sinfo/%s"),
-			  AdminDir.c_str(),Name);
-	    close(Fd);
-	    break;
-	 }
-	 File = Buffer;
-      }
-      else
-      {
-	 // Use mmap
-	 File = (char *)mmap(0,Stat.st_size,PROT_READ,MAP_PRIVATE,Fd,0);
-	 if (File == (char *)(-1))
-	 {
-	    _error->Errno("mmap",_("Failed reading the list file %sinfo/%s"),
-			  AdminDir.c_str(),Name);
-	    close(Fd);
-	    break;
-	 }	    
-      }
-      
-      // Parse it
-      const char *Start = File;
-      const char *End = File;
-      const char *Finish = File + Stat.st_size;
-      for (; End < Finish; End++)
-      {
-	 // Not an end of line
-	 if (*End != '\n' && End + 1 < Finish)
-	    continue;
-
-	 // Skip blank lines
-	 if (End - Start > 1)
-	 {
-	    pkgFLCache::NodeIterator Node = FList->GetNode(Start,End,
- 					      FlPkg.Offset(),true,false);
-	    if (Node.end() == true)
-	    {
-	       _error->Error(_("Internal error getting a node"));
-	       break;
-	    }
-	 }
-	 
-	 // Skip past the end of line
-	 for (; *End == '\n' && End < Finish; End++);
-	 Start = End;
-      }      
-      
-      close(Fd);
-      if ((unsigned)Stat.st_size >= BufSize)
-	 munmap((caddr_t)File,Stat.st_size);
-      
-      // Failed
-      if (End < Finish)
-	 break;
-      
-      Count++;
-   }
-
-   delete [] Buffer;
-   if (chdir(Cwd.c_str()) != 0)
-      chdir("/");
-   
-   return !_error->PendingError();
-}
-									/*}}}*/
-// DpkgDB::ReadDiversions - Load the diversions file			/*{{{*/
-// ---------------------------------------------------------------------
-/* Read the diversion file in from disk. This is usually invoked by 
-   LoadChanges before performing an operation that uses the FLCache. */
-bool debDpkgDB::ReadDiversions()
-{
-   struct stat Stat;
-   if (stat((AdminDir + "diversions").c_str(),&Stat) != 0)
-      return true;
-   
-   if (_error->PendingError() == true)
-      return false;
-   
-   FILE *Fd = fopen((AdminDir + "diversions").c_str(),"r");
-   if (Fd == 0)
-      return _error->Errno("fopen",_("Failed to open the diversions file %sdiversions"),AdminDir.c_str());
-	
-   FList->BeginDiverLoad();
-   while (1)
-   {
-      char From[300];
-      char To[300];
-      char Package[100];
-   
-      // Read the three lines in
-      if (fgets(From,sizeof(From),Fd) == 0)
-	 break;
-      if (fgets(To,sizeof(To),Fd) == 0 ||
-	  fgets(Package,sizeof(Package),Fd) == 0)
-      {
-	 _error->Error(_("The diversion file is corrupted"));
-	 break;
-      }
-      
-      // Strip the \ns
-      unsigned long Len = strlen(From);
-      if (Len < 2 || From[Len-1] != '\n')
-	 _error->Error(_("Invalid line in the diversion file: %s"),From);
-      else
-	 From[Len-1] = 0;
-      Len = strlen(To);
-      if (Len < 2 || To[Len-1] != '\n')
-	 _error->Error(_("Invalid line in the diversion file: %s"),To);
-      else
-	 To[Len-1] = 0;     
-      Len = strlen(Package);
-      if (Len < 2 || Package[Len-1] != '\n')
-	 _error->Error(_("Invalid line in the diversion file: %s"),Package);
-      else
-	 Package[Len-1] = 0;
-      
-      // Make sure the lines were parsed OK
-      if (_error->PendingError() == true)
-	 break;
-      
-      // Fetch a package
-      if (strcmp(Package,":") == 0)
-	 Package[0] = 0;
-      pkgFLCache::PkgIterator FlPkg = FList->GetPkg(Package,0,true);
-      if (FlPkg.end() == true)
-      {
-	 _error->Error(_("Internal error getting a package name"));
-	 break;
-      }
-      
-      // Install the diversion
-      if (FList->AddDiversion(FlPkg,From,To) == false)
-      {
-	 _error->Error(_("Internal error adding a diversion"));
-	 break;
-      }
-   }
-   if (_error->PendingError() == false)
-      FList->FinishDiverLoad();
-   
-   DiverInode = Stat.st_ino;
-   DiverTime = Stat.st_mtime;
-   
-   fclose(Fd);
-   return !_error->PendingError();
-}
-									/*}}}*/
-// DpkgDB::ReadFileList - Read the file listing				/*{{{*/
-// ---------------------------------------------------------------------
-/* Read in the file listing. The file listing is created from three
-   sources, *.list, Conffile sections and the Diversion table. */
-bool debDpkgDB::ReadyFileList(OpProgress &Progress)
-{
-   if (Cache == 0)
-      return _error->Error(_("The pkg cache must be initialized first"));
-   if (FList != 0)
-   {
-      Progress.OverallProgress(1,1,1,_("Reading file listing"));
-      return true;
-   }
-   
-   // Create the cache and read in the file listing
-   FileMap = new DynamicMMap(MMap::Public);
-   FList = new pkgFLCache(*FileMap);
-   if (_error->PendingError() == true || 
-       ReadFList(Progress) == false ||
-       ReadConfFiles() == false || 
-       ReadDiversions() == false)
-   {
-      delete FList;
-      delete FileMap;
-      FileMap = 0;
-      FList = 0;
-      return false;
-   }
-      
-   cout << "Node: " << FList->HeaderP->NodeCount << ',' << FList->HeaderP->UniqNodes << endl;
-   cout << "Dir: " << FList->HeaderP->DirCount << endl;
-   cout << "Package: " << FList->HeaderP->PackageCount << endl;
-   cout << "HashSize: " << FList->HeaderP->HashSize << endl;
-   cout << "Size: " << FileMap->Size() << endl;
-   cout << endl;
-
-   return true;
-}
-									/*}}}*/
-// DpkgDB::ReadConfFiles - Read the conf file sections from the s-file	/*{{{*/
-// ---------------------------------------------------------------------
-/* Reading the conf files is done by reparsing the status file. This is
-   actually rather fast so it is no big deal. */
-bool debDpkgDB::ReadConfFiles()
-{
-   FileFd File(_config->FindFile("Dir::State::status"),FileFd::ReadOnly);
-   pkgTagFile Tags(&File);
-   if (_error->PendingError() == true)
-      return false;
-   
-   pkgTagSection Section;   
-   while (1)
-   {
-      // Skip to the next section
-      unsigned long Offset = Tags.Offset();
-      if (Tags.Step(Section) == false)
-	 break;
-	 
-      // Parse the line
-      const char *Start;
-      const char *Stop;
-      if (Section.Find("Conffiles",Start,Stop) == false)
-	 continue;
-
-      const char *PkgStart;
-      const char *PkgEnd;
-      if (Section.Find("Package",PkgStart,PkgEnd) == false)
-	 return _error->Error(_("Failed to find a Package: header, offset %lu"),Offset);
-
-      // Snag a package record for it
-      pkgFLCache::PkgIterator FlPkg = FList->GetPkg(PkgStart,PkgEnd,true);
-      if (FlPkg.end() == true)
-	 return _error->Error(_("Internal error getting a package name"));
-
-      // Parse the conf file lines
-      while (1)
-      {
-	 for (; isspace(*Start) != 0 && Start < Stop; Start++);
-	 if (Start == Stop)
-	    break;
-
-	 // Split it into words
-	 const char *End = Start;
-	 for (; isspace(*End) == 0 && End < Stop; End++);
-	 const char *StartMd5 = End;
-	 for (; isspace(*StartMd5) != 0 && StartMd5 < Stop; StartMd5++);
-	 const char *EndMd5 = StartMd5;
-	 for (; isspace(*EndMd5) == 0 && EndMd5 < Stop; EndMd5++);
-	 if (StartMd5 == EndMd5 || Start == End)
-	    return _error->Error(_("Bad ConfFile section in the status file. Offset %lu"),Offset);
-	 	 
-	 // Insert a new entry
-	 unsigned char MD5[16];
-	 if (Hex2Num(string(StartMd5,EndMd5-StartMd5),MD5,16) == false)
-	    return _error->Error(_("Error parsing MD5. Offset %lu"),Offset);
-
-	 if (FList->AddConfFile(Start,End,FlPkg,MD5) == false)
-	    return false;
-	 Start = EndMd5;
-      }      
-   }   
-   
-   return true;
-}
-									/*}}}*/
-// DpkgDB::LoadChanges - Read in any changed state files		/*{{{*/
-// ---------------------------------------------------------------------
-/* The only file in the dpkg system that can change while packages are
-   unpacking is the diversions file. */
-bool debDpkgDB::LoadChanges()
-{
-   struct stat Stat;
-   if (stat((AdminDir + "diversions").c_str(),&Stat) != 0)
-      return true;
-   if (DiverInode == Stat.st_ino && DiverTime == Stat.st_mtime)
-      return true;
-   return ReadDiversions();
-}
-									/*}}}*/
diff --git a/apt-inst/deb/dpkgdb.h b/apt-inst/deb/dpkgdb.h
deleted file mode 100644
index 125845f96..000000000
--- a/apt-inst/deb/dpkgdb.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- mode: cpp; mode: fold -*-
-// Description								/*{{{*/
-// $Id: dpkgdb.h,v 1.2 2001/02/20 07:03:17 jgg Exp $
-/* ######################################################################
-
-   DPKGv1 Data Base Implemenation
-   
-   The DPKGv1 database is typically stored in /var/lib/dpkg/. For 
-   DPKGv1 the 'meta' information is the contents of the .deb control.tar.gz
-   member prepended by the package name. The meta information is unpacked
-   in its temporary directory and then migrated into the main list dir
-   at a checkpoint.
-   
-   Journaling is providing by syncronized file writes to the updates sub
-   directory.
-
-   ##################################################################### */
-									/*}}}*/
-#ifndef PKGLIB_DPKGDB_H
-#define PKGLIB_DPKGDB_H
-
-
-#include <apt-pkg/database.h>
-
-class debDpkgDB : public pkgDataBase
-{
-   protected:
-   
-   string AdminDir;
-   DynamicMMap *CacheMap;
-   DynamicMMap *FileMap;
-   unsigned long DiverInode;
-   signed long DiverTime;
-   
-   virtual bool InitMetaTmp(string &Dir);
-   bool ReadFList(OpProgress &Progress);
-   bool ReadDiversions();
-   bool ReadConfFiles();
-      
-   public:
-
-   virtual bool ReadyFileList(OpProgress &Progress);
-   virtual bool ReadyPkgCache(OpProgress &Progress);
-   virtual bool LoadChanges();
-   
-   debDpkgDB();
-   virtual ~debDpkgDB();
-};
-
-#endif
diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc
index 9b6a56848..65d1aa188 100644
--- a/apt-inst/dirstream.cc
+++ b/apt-inst/dirstream.cc
@@ -11,6 +11,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/dirstream.h>
 #include <apt-pkg/error.h>
 
@@ -44,15 +46,13 @@ bool pkgDirStream::DoItem(Item &Itm,int &Fd)
 	 // fchmod deals with umask and fchown sets the ownership
 	 if (fchmod(iFd,Itm.Mode) != 0)
 	 {
-	    _error->Errno("fchmod",_("Failed to write file %s"), Itm.Name);
 	    close(iFd);
-	    return false;
+	    return _error->Errno("fchmod",_("Failed to write file %s"), Itm.Name);
 	 }
 	 if (fchown(iFd,Itm.UID,Itm.GID) != 0 && errno != EPERM)
 	 {
-	    return _error->Errno("fchown",_("Failed to write file %s"), Itm.Name);
 	    close(iFd);
-	    return false;
+	    return _error->Errno("fchown",_("Failed to write file %s"), Itm.Name);
 	 }
 	 Fd = iFd;
 	 return true;
diff --git a/apt-inst/extract.cc b/apt-inst/extract.cc
index cd8edb27a..29e163028 100644
--- a/apt-inst/extract.cc
+++ b/apt-inst/extract.cc
@@ -44,9 +44,12 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/extract.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/debversion.h>
+#include <apt-pkg/fileutl.h>
 
 #include <sys/stat.h>
 #include <stdio.h>
diff --git a/apt-inst/extract.h b/apt-inst/extract.h
index 71222983c..7143fa409 100644
--- a/apt-inst/extract.h
+++ b/apt-inst/extract.h
@@ -33,7 +33,7 @@ class pkgExtract : public pkgDirStream
    
    bool HandleOverwrites(pkgFLCache::NodeIterator Nde,
 			 bool DiverCheck = false);
-   bool CheckDirReplace(string Dir,unsigned int Depth = 0);
+   bool CheckDirReplace(std::string Dir,unsigned int Depth = 0);
    
    public:
    
diff --git a/apt-inst/filelist.cc b/apt-inst/filelist.cc
index 060aa53d7..879c07855 100644
--- a/apt-inst/filelist.cc
+++ b/apt-inst/filelist.cc
@@ -32,6 +32,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/filelist.h>
 #include <apt-pkg/mmap.h>
 #include <apt-pkg/error.h>
diff --git a/apt-inst/filelist.h b/apt-inst/filelist.h
index c74a310e4..0405d61df 100644
--- a/apt-inst/filelist.h
+++ b/apt-inst/filelist.h
@@ -28,9 +28,10 @@
 #ifndef PKGLIB_FILELIST_H
 #define PKGLIB_FILELIST_H
 
+#include <apt-pkg/mmap.h>
 
 #include <cstring>
-#include <apt-pkg/mmap.h>
+#include <string>
 
 class pkgFLCache
 {
@@ -48,7 +49,7 @@ class pkgFLCache
    class DiverIterator;
    
    protected:
-   string CacheFile;
+   std::string CacheFile;
    DynamicMMap &Map;
    map_ptrloc LastTreeLookup;
    unsigned long LastLookupSize;
diff --git a/apt-inst/makefile b/apt-inst/makefile
index 785dc62ba..cfb22741a 100644
--- a/apt-inst/makefile
+++ b/apt-inst/makefile
@@ -14,7 +14,7 @@ include ../buildlib/libversion.mak
 
 # The library name
 LIBRARY=apt-inst
-MAJOR=1.2
+MAJOR=1.5
 MINOR=0
 SLIBS=$(PTHREADLIB) -lapt-pkg
 APT_DOMAIN:=libapt-inst$(MAJOR)
@@ -23,12 +23,11 @@ APT_DOMAIN:=libapt-inst$(MAJOR)
 SOURCE = contrib/extracttar.cc contrib/arfile.cc
 
 # Source code for the main library
-SOURCE+= filelist.cc database.cc dirstream.cc extract.cc \
-         deb/dpkgdb.cc deb/debfile.cc
+SOURCE+= filelist.cc dirstream.cc extract.cc deb/debfile.cc
 
 # Public header files
-HEADERS = extracttar.h arfile.h filelist.h database.h extract.h \
-          dpkgdb.h dirstream.h debfile.h
+HEADERS = extracttar.h arfile.h filelist.h extract.h \
+          dirstream.h debfile.h
 
 HEADERS := $(addprefix apt-pkg/,$(HEADERS))
 include $(LIBRARY_H)
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index eda45d7be..a30e98858 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -13,6 +13,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/aptconfiguration.h>
@@ -23,9 +25,9 @@
 #include <apt-pkg/md5.h>
 #include <apt-pkg/sha1.h>
 #include <apt-pkg/tagfile.h>
+#include <apt-pkg/indexrecords.h>
+#include <apt-pkg/metaindex.h>
 
-#include <apti18n.h>
-    
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
@@ -33,6 +35,8 @@
 #include <sstream>
 #include <stdio.h>
 #include <ctime>
+
+#include <apti18n.h>
 									/*}}}*/
 
 using namespace std;
@@ -94,7 +98,7 @@ void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
 // ---------------------------------------------------------------------
 /* Stash status and the file size. Note that setting Complete means 
    sub-phases of the acquire process such as decompresion are operating */
-void pkgAcquire::Item::Start(string /*Message*/,unsigned long Size)
+void pkgAcquire::Item::Start(string /*Message*/,unsigned long long Size)
 {
    Status = StatFetching;
    if (FileSize == 0 && Complete == false)
@@ -104,7 +108,7 @@ void pkgAcquire::Item::Start(string /*Message*/,unsigned long Size)
 // Acquire::Item::Done - Item downloaded OK				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void pkgAcquire::Item::Done(string Message,unsigned long Size,string Hash,
+void pkgAcquire::Item::Done(string Message,unsigned long long Size,string Hash,
 			    pkgAcquire::MethodConfig *Cnf)
 {
    // We just downloaded something..
@@ -185,14 +189,14 @@ void pkgAcquire::Item::ReportMirrorFailure(string FailCode)
 									/*}}}*/
 // AcqSubIndex::AcqSubIndex - Constructor				/*{{{*/
 // ---------------------------------------------------------------------
-/* Get the Index file first and see if there are languages available
- * If so, create a pkgAcqIndexTrans for the found language(s).
- */
+/* Get a sub-index file based on checksums from a 'master' file and
+   possibly query additional files */
 pkgAcqSubIndex::pkgAcqSubIndex(pkgAcquire *Owner, string const &URI,
 				 string const &URIDesc, string const &ShortDesc,
 				 HashString const &ExpectedHash)
    : Item(Owner), ExpectedHash(ExpectedHash)
 {
+   /* XXX: Beware: Currently this class does nothing (of value) anymore ! */
    Debug = _config->FindB("Debug::pkgAcquire::SubIndex",false);
 
    DestFile = _config->FindDir("Dir::State::lists") + "partial/";
@@ -232,20 +236,10 @@ void pkgAcqSubIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)	/*{{{*
    Status = StatDone;
    Dequeue();
 
-   // No good Index is provided, so try guessing
-   std::vector<std::string> langs = APT::Configuration::getLanguages(true);
-   for (std::vector<std::string>::const_iterator l = langs.begin();
-	l != langs.end(); ++l)
-   {
-      if (*l == "none") continue;
-      string const file = "Translation-" + *l;
-      new pkgAcqIndexTrans(Owner, Desc.URI.substr(0, Desc.URI.rfind('/')+1).append(file),
-		Desc.Description.erase(Desc.Description.rfind(' ')+1).append(file),
-		file);
-   }
+   // No good Index is provided
 }
 									/*}}}*/
-void pkgAcqSubIndex::Done(string Message,unsigned long Size,string Md5Hash,	/*{{{*/
+void pkgAcqSubIndex::Done(string Message,unsigned long long Size,string Md5Hash,	/*{{{*/
 			   pkgAcquire::MethodConfig *Cnf)
 {
    if(Debug)
@@ -301,38 +295,7 @@ bool pkgAcqSubIndex::ParseIndex(string const &IndexFile)		/*{{{*/
    indexRecords SubIndexParser;
    if (FileExists(IndexFile) == false || SubIndexParser.Load(IndexFile) == false)
       return false;
-
-   std::vector<std::string> lang = APT::Configuration::getLanguages(true);
-   for (std::vector<std::string>::const_iterator l = lang.begin();
-	l != lang.end(); ++l)
-   {
-      if (*l == "none")
-	 continue;
-
-      string file = "Translation-" + *l;
-      indexRecords::checkSum const *Record = SubIndexParser.Lookup(file);
-      HashString expected;
-      if (Record == NULL)
-      {
-	 // FIXME: the Index file provided by debian currently only includes bz2 records
-	 Record = SubIndexParser.Lookup(file + ".bz2");
-	 if (Record == NULL)
-	    continue;
-      }
-      else
-      {
-	 expected = Record->Hash;
-	 if (expected.empty() == true)
-	    continue;
-      }
-
-      IndexTarget target;
-      target.Description = Desc.Description.erase(Desc.Description.rfind(' ')+1).append(file);
-      target.MetaKey = file;
-      target.ShortDesc = file;
-      target.URI = Desc.URI.substr(0, Desc.URI.rfind('/')+1).append(file);
-      new pkgAcqIndexTrans(Owner, &target, expected, &SubIndexParser);
-   }
+   // so something with the downloaded index
    return true;
 }
 									/*}}}*/
@@ -434,7 +397,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile)		/*{{{*/
 
       FileFd fd(CurrentPackagesFile, FileFd::ReadOnly);
       SHA1Summation SHA1;
-      SHA1.AddFD(fd.Fd(), fd.Size());
+      SHA1.AddFD(fd);
       string const local_sha1 = SHA1.Result();
 
       if(local_sha1 == ServerSha1) 
@@ -544,7 +507,7 @@ void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)	/*{{{
    Dequeue();
 }
 									/*}}}*/
-void pkgAcqDiffIndex::Done(string Message,unsigned long Size,string Md5Hash,	/*{{{*/
+void pkgAcqDiffIndex::Done(string Message,unsigned long long Size,string Md5Hash,	/*{{{*/
 			   pkgAcquire::MethodConfig *Cnf)
 {
    if(Debug)
@@ -665,7 +628,7 @@ bool pkgAcqIndexDiffs::QueueNextDiff()					/*{{{*/
 
    FileFd fd(FinalFile, FileFd::ReadOnly);
    SHA1Summation SHA1;
-   SHA1.AddFD(fd.Fd(), fd.Size());
+   SHA1.AddFD(fd);
    string local_sha1 = string(SHA1.Result());
    if(Debug)
       std::clog << "QueueNextDiff: " 
@@ -710,7 +673,7 @@ bool pkgAcqIndexDiffs::QueueNextDiff()					/*{{{*/
    return true;
 }
 									/*}}}*/
-void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash,	/*{{{*/
+void pkgAcqIndexDiffs::Done(string Message,unsigned long long Size,string Md5Hash,	/*{{{*/
 			    pkgAcquire::MethodConfig *Cnf)
 {
    if(Debug)
@@ -808,6 +771,13 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, IndexTarget const *Target,
    if (CompressionExtension.empty() == false)
       CompressionExtension.erase(CompressionExtension.end()-1);
 
+   // only verify non-optional targets, see acquire-item.h for a FIXME
+   // to make this more flexible
+   if (Target->IsOptional())
+     Verify = false;
+   else
+     Verify = true;
+
    Init(Target->URI, Target->Description, Target->ShortDesc);
 }
 									/*}}}*/
@@ -881,7 +851,7 @@ void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)	/*{{{*/
    to the uncompressed version of the file. If this is so the file
    is copied into the partial directory. In all other cases the file
    is decompressed with a gzip uri. */
-void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash,
+void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash,
 		       pkgAcquire::MethodConfig *Cfg)
 {
    Item::Done(Message,Size,Hash,Cfg);
@@ -905,6 +875,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash,
 
       /* Verify the index file for correctness (all indexes must
        * have a Package field) (LP: #346386) (Closes: #627642) */
+      if (Verify == true)
       {
 	 FileFd fd(DestFile, FileFd::ReadOnly);
 	 pkgTagSection sec;
@@ -1123,7 +1094,7 @@ string pkgAcqMetaSig::Custom600Headers()
    return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
 }
 
-void pkgAcqMetaSig::Done(string Message,unsigned long Size,string MD5,
+void pkgAcqMetaSig::Done(string Message,unsigned long long Size,string MD5,
 			 pkgAcquire::MethodConfig *Cfg)
 {
    Item::Done(Message,Size,MD5,Cfg);
@@ -1232,7 +1203,7 @@ string pkgAcqMetaIndex::Custom600Headers()
    return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
 }
 									/*}}}*/
-void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string Hash,	/*{{{*/
+void pkgAcqMetaIndex::Done(string Message,unsigned long long Size,string Hash,	/*{{{*/
 			   pkgAcquire::MethodConfig *Cfg)
 {
    Item::Done(Message,Size,Hash,Cfg);
@@ -1373,6 +1344,18 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify)				/*{{{*/
       return;
    }
 #endif
+   bool transInRelease = false;
+   {
+      std::vector<std::string> const keys = MetaIndexParser->MetaKeys();
+      for (std::vector<std::string>::const_iterator k = keys.begin(); k != keys.end(); ++k)
+	 // FIXME: Feels wrong to check for hardcoded string here, but what should we do else…
+	 if (k->find("Translation-") != std::string::npos)
+	 {
+	    transInRelease = true;
+	    break;
+	 }
+   }
+
    for (vector <struct IndexTarget*>::const_iterator Target = IndexTargets->begin();
         Target != IndexTargets->end();
         ++Target)
@@ -1410,8 +1393,15 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify)				/*{{{*/
 	 if ((*Target)->IsSubIndex() == true)
 	    new pkgAcqSubIndex(Owner, (*Target)->URI, (*Target)->Description,
 				(*Target)->ShortDesc, ExpectedIndexHash);
-	 else
-	    new pkgAcqIndexTrans(Owner, *Target, ExpectedIndexHash, MetaIndexParser);
+	 else if (transInRelease == false || MetaIndexParser->Exists((*Target)->MetaKey) == true)
+	 {
+	    if (_config->FindB("Acquire::PDiffs",true) == true && transInRelease == true &&
+		MetaIndexParser->Exists(string((*Target)->MetaKey).append(".diff/Index")) == true)
+	       new pkgAcqDiffIndex(Owner, (*Target)->URI, (*Target)->Description,
+				   (*Target)->ShortDesc, ExpectedIndexHash);
+	    else
+	       new pkgAcqIndexTrans(Owner, *Target, ExpectedIndexHash, MetaIndexParser);
+	 }
 	 continue;
       }
 
@@ -1738,6 +1728,8 @@ bool pkgAcqArchive::QueueNext()
       string PkgFile = Parse.FileName();
       if (ForceHash.empty() == false)
       {
+	 if(stringcasecmp(ForceHash, "sha512") == 0)
+	    ExpectedHash = HashString("SHA512", Parse.SHA512Hash());
 	 if(stringcasecmp(ForceHash, "sha256") == 0)
 	    ExpectedHash = HashString("SHA256", Parse.SHA256Hash());
 	 else if (stringcasecmp(ForceHash, "sha1") == 0)
@@ -1748,7 +1740,9 @@ bool pkgAcqArchive::QueueNext()
       else
       {
 	 string Hash;
-	 if ((Hash = Parse.SHA256Hash()).empty() == false)
+	 if ((Hash = Parse.SHA512Hash()).empty() == false)
+	    ExpectedHash = HashString("SHA512", Hash);
+	 else if ((Hash = Parse.SHA256Hash()).empty() == false)
 	    ExpectedHash = HashString("SHA256", Hash);
 	 else if ((Hash = Parse.SHA1Hash()).empty() == false)
 	    ExpectedHash = HashString("SHA1", Hash);
@@ -1772,7 +1766,7 @@ bool pkgAcqArchive::QueueNext()
       if (stat(FinalFile.c_str(),&Buf) == 0)
       {
 	 // Make sure the size matches
-	 if ((unsigned)Buf.st_size == Version->Size)
+	 if ((unsigned long long)Buf.st_size == Version->Size)
 	 {
 	    Complete = true;
 	    Local = true;
@@ -1791,7 +1785,7 @@ bool pkgAcqArchive::QueueNext()
       if (stat(FinalFile.c_str(),&Buf) == 0)
       {
 	 // Make sure the size matches
-	 if ((unsigned)Buf.st_size == Version->Size)
+	 if ((unsigned long long)Buf.st_size == Version->Size)
 	 {
 	    Complete = true;
 	    Local = true;
@@ -1811,12 +1805,23 @@ bool pkgAcqArchive::QueueNext()
       if (stat(DestFile.c_str(),&Buf) == 0)
       {
 	 // Hmm, the partial file is too big, erase it
-	 if ((unsigned)Buf.st_size > Version->Size)
+	 if ((unsigned long long)Buf.st_size > Version->Size)
 	    unlink(DestFile.c_str());
 	 else
 	    PartialSize = Buf.st_size;
       }
-      
+
+      // Disables download of archives - useful if no real installation follows,
+      // e.g. if we are just interested in proposed installation order
+      if (_config->FindB("Debug::pkgAcqArchive::NoQueue", false) == true)
+      {
+	 Complete = true;
+	 Local = true;
+	 Status = StatDone;
+	 StoreFilename = DestFile = FinalFile;
+	 return true;
+      }
+
       // Create the item
       Local = false;
       Desc.URI = Index->ArchiveURI(PkgFile);
@@ -1834,7 +1839,7 @@ bool pkgAcqArchive::QueueNext()
 // AcqArchive::Done - Finished fetching					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void pkgAcqArchive::Done(string Message,unsigned long Size,string CalcHash,
+void pkgAcqArchive::Done(string Message,unsigned long long Size,string CalcHash,
 			 pkgAcquire::MethodConfig *Cfg)
 {
    Item::Done(Message,Size,CalcHash,Cfg);
@@ -1945,7 +1950,7 @@ void pkgAcqArchive::Finished()
 // ---------------------------------------------------------------------
 /* The file is added to the queue */
 pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string Hash,
-		       unsigned long Size,string Dsc,string ShortDesc,
+		       unsigned long long Size,string Dsc,string ShortDesc,
 		       const string &DestDir, const string &DestFilename,
                        bool IsIndexFile) :
                        Item(Owner), ExpectedHash(Hash), IsIndexFile(IsIndexFile)
@@ -1973,7 +1978,7 @@ pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string Hash,
    if (stat(DestFile.c_str(),&Buf) == 0)
    {
       // Hmm, the partial file is too big, erase it
-      if ((unsigned)Buf.st_size > Size)
+      if ((unsigned long long)Buf.st_size > Size)
 	 unlink(DestFile.c_str());
       else
 	 PartialSize = Buf.st_size;
@@ -1985,7 +1990,7 @@ pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string Hash,
 // AcqFile::Done - Item downloaded OK					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void pkgAcqFile::Done(string Message,unsigned long Size,string CalcHash,
+void pkgAcqFile::Done(string Message,unsigned long long Size,string CalcHash,
 		      pkgAcquire::MethodConfig *Cnf)
 {
    Item::Done(Message,Size,CalcHash,Cnf);
@@ -2073,13 +2078,3 @@ string pkgAcqFile::Custom600Headers()
    return "";
 }
 									/*}}}*/
-bool IndexTarget::IsOptional() const {
-   if (strncmp(ShortDesc.c_str(), "Translation", 11) != 0)
-      return false;
-   return true;
-}
-bool IndexTarget::IsSubIndex() const {
-   if (ShortDesc != "TranslationIndex")
-      return false;
-   return true;
-}
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index f763577ee..51d539450 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -21,13 +21,17 @@
 #define PKGLIB_ACQUIRE_ITEM_H
 
 #include <apt-pkg/acquire.h>
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/weakptr.h>
+#include <apt-pkg/pkgcache.h>
+
+#ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/vendor.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/indexrecords.h>
-#include <apt-pkg/hashes.h>
-#include <apt-pkg/weakptr.h>
+#endif
 
 /** \addtogroup acquire
  *  @{
@@ -35,6 +39,10 @@
  *  \file acquire-item.h
  */
 
+class indexRecords;
+class pkgRecords;
+class pkgSourceList;
+
 /** \brief Represents the process by which a pkgAcquire object should	{{{
  *  retrieve a file or a collection of files.
  *
@@ -74,7 +82,7 @@ class pkgAcquire::Item : public WeakPointable
     *  \param To The new name of #From.  If #To exists it will be
     *  overwritten.
     */
-   void Rename(string From,string To);
+   void Rename(std::string From,std::string To);
    
    public:
 
@@ -109,7 +117,7 @@ class pkgAcquire::Item : public WeakPointable
    /** \brief Contains a textual description of the error encountered
     *  if #Status is #StatError or #StatAuthError.
     */
-   string ErrorText;
+   std::string ErrorText;
 
    /** \brief The size of the object to fetch. */
    unsigned long long FileSize;
@@ -143,7 +151,7 @@ class pkgAcquire::Item : public WeakPointable
     *  download progress indicator's overall statistics.
     */
    bool Local;
-   string UsedMirror;
+   std::string UsedMirror;
 
    /** \brief The number of fetch queues into which this item has been
     *  inserted.
@@ -158,7 +166,7 @@ class pkgAcquire::Item : public WeakPointable
    /** \brief The name of the file into which the retrieved object
     *  will be written.
     */
-   string DestFile;
+   std::string DestFile;
 
    /** \brief Invoked by the acquire worker when the object couldn't
     *  be fetched.
@@ -173,7 +181,7 @@ class pkgAcquire::Item : public WeakPointable
     *
     *  \sa pkgAcqMethod
     */
-   virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
+   virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
 
    /** \brief Invoked by the acquire worker when the object was
     *  fetched successfully.
@@ -194,7 +202,7 @@ class pkgAcquire::Item : public WeakPointable
     *
     *  \sa pkgAcqMethod
     */
-   virtual void Done(string Message,unsigned long Size,string Hash,
+   virtual void Done(std::string Message,unsigned long long Size,std::string Hash,
 		     pkgAcquire::MethodConfig *Cnf);
 
    /** \brief Invoked when the worker starts to fetch this object.
@@ -206,7 +214,7 @@ class pkgAcquire::Item : public WeakPointable
     *
     *  \sa pkgAcqMethod
     */
-   virtual void Start(string Message,unsigned long Size);
+   virtual void Start(std::string Message,unsigned long long Size);
 
    /** \brief Custom headers to be sent to the fetch process.
     *
@@ -216,18 +224,18 @@ class pkgAcquire::Item : public WeakPointable
     *  line, so they should (if nonempty) have a leading newline and
     *  no trailing newline.
     */
-   virtual string Custom600Headers() {return string();};
+   virtual std::string Custom600Headers() {return std::string();};
 
    /** \brief A "descriptive" URI-like string.
     *
     *  \return a URI that should be used to describe what is being fetched.
     */
-   virtual string DescURI() = 0;
+   virtual std::string DescURI() = 0;
    /** \brief Short item description.
     *
     *  \return a brief description of the object being fetched.
     */
-   virtual string ShortDesc() {return DescURI();}
+   virtual std::string ShortDesc() {return DescURI();}
 
    /** \brief Invoked by the worker when the download is completely done. */
    virtual void Finished() {};
@@ -237,7 +245,7 @@ class pkgAcquire::Item : public WeakPointable
     *  \return the HashSum of this object, if applicable; otherwise, an
     *  empty string.
     */
-   virtual string HashSum() {return string();};
+   virtual std::string HashSum() {return std::string();};
 
    /** \return the acquire process with which this item is associated. */
    pkgAcquire *GetOwner() {return Owner;};
@@ -253,7 +261,7 @@ class pkgAcquire::Item : public WeakPointable
     * 
     *  \param FailCode A short failure string that is send
     */
-   void ReportMirrorFailure(string FailCode);
+   void ReportMirrorFailure(std::string FailCode);
 
 
    /** \brief Initialize an item.
@@ -278,10 +286,10 @@ class pkgAcquire::Item : public WeakPointable
 /** \brief Information about an index patch (aka diff). */		/*{{{*/
 struct DiffInfo {
    /** The filename of the diff. */
-   string file;
+   std::string file;
 
    /** The sha1 hash of the diff. */
-   string sha1;
+   std::string sha1;
 
    /** The size of the diff. */
    unsigned long size;
@@ -308,12 +316,12 @@ class pkgAcqSubIndex : public pkgAcquire::Item
 
  public:
    // Specialized action members
-   virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
-   virtual void Done(string Message,unsigned long Size,string Md5Hash,
+   virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+   virtual void Done(std::string Message,unsigned long long Size,std::string Md5Hash,
 		     pkgAcquire::MethodConfig *Cnf);
-   virtual string DescURI() {return Desc.URI;};
-   virtual string Custom600Headers();
-   virtual bool ParseIndex(string const &IndexFile);
+   virtual std::string DescURI() {return Desc.URI;};
+   virtual std::string Custom600Headers();
+   virtual bool ParseIndex(std::string const &IndexFile);
 
    /** \brief Create a new pkgAcqSubIndex.
     *
@@ -327,8 +335,8 @@ class pkgAcqSubIndex : public pkgAcquire::Item
     *
     *  \param ExpectedHash The list file's MD5 signature.
     */
-   pkgAcqSubIndex(pkgAcquire *Owner, string const &URI,string const &URIDesc,
-		   string const &ShortDesc, HashString const &ExpectedHash);
+   pkgAcqSubIndex(pkgAcquire *Owner, std::string const &URI,std::string const &URIDesc,
+		   std::string const &ShortDesc, HashString const &ExpectedHash);
 };
 									/*}}}*/
 /** \brief An item that is responsible for fetching an index file of	{{{
@@ -352,7 +360,7 @@ class pkgAcqDiffIndex : public pkgAcquire::Item
    /** \brief The URI of the index file to recreate at our end (either
     *  by downloading it or by applying partial patches).
     */
-   string RealURI;
+   std::string RealURI;
 
    /** \brief The Hash that the real index file should have after
     *  all patches have been applied.
@@ -362,20 +370,20 @@ class pkgAcqDiffIndex : public pkgAcquire::Item
    /** \brief The index file which will be patched to generate the new
     *  file.
     */
-   string CurrentPackagesFile;
+   std::string CurrentPackagesFile;
 
    /** \brief A description of the Packages file (stored in
     *  pkgAcquire::ItemDesc::Description).
     */
-   string Description;
+   std::string Description;
 
  public:
    // Specialized action members
-   virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
-   virtual void Done(string Message,unsigned long Size,string Md5Hash,
+   virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+   virtual void Done(std::string Message,unsigned long long Size,std::string Md5Hash,
 		     pkgAcquire::MethodConfig *Cnf);
-   virtual string DescURI() {return RealURI + "Index";};
-   virtual string Custom600Headers();
+   virtual std::string DescURI() {return RealURI + "Index";};
+   virtual std::string Custom600Headers();
 
    /** \brief Parse the Index file for a set of Packages diffs.
     *
@@ -387,7 +395,7 @@ class pkgAcqDiffIndex : public pkgAcquire::Item
     *  \return \b true if the Index file was successfully parsed, \b
     *  false otherwise.
     */
-   bool ParseDiffIndex(string IndexDiffFile);
+   bool ParseDiffIndex(std::string IndexDiffFile);
    
 
    /** \brief Create a new pkgAcqDiffIndex.
@@ -402,8 +410,8 @@ class pkgAcqDiffIndex : public pkgAcquire::Item
     *
     *  \param ExpectedHash The list file's MD5 signature.
     */
-   pkgAcqDiffIndex(pkgAcquire *Owner,string URI,string URIDesc,
-		   string ShortDesc, HashString ExpectedHash);
+   pkgAcqDiffIndex(pkgAcquire *Owner,std::string URI,std::string URIDesc,
+		   std::string ShortDesc, HashString ExpectedHash);
 };
 									/*}}}*/
 /** \brief An item that is responsible for fetching all the patches	{{{
@@ -460,7 +468,7 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item
    /** \brief The URI of the package index file that is being
     *  reconstructed.
     */
-   string RealURI;
+   std::string RealURI;
 
    /** \brief The HashSum of the package index file that is being
     *  reconstructed.
@@ -468,7 +476,7 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item
    HashString ExpectedHash;
 
    /** A description of the file being downloaded. */
-   string Description;
+   std::string Description;
 
    /** The patches that remain to be downloaded, including the patch
     *  being downloaded right now.  This list should be ordered so
@@ -478,10 +486,10 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item
     *  dictionary instead of relying on ordering and stripping them
     *  off the front?
     */
-   vector<DiffInfo> available_patches;
+   std::vector<DiffInfo> available_patches;
 
    /** Stop applying patches when reaching that sha1 */
-   string ServerSha1;
+   std::string ServerSha1;
 
    /** The current status of this patch. */
    enum DiffState
@@ -506,11 +514,11 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item
     *  This method will fall back to downloading the whole index file
     *  outright; its arguments are ignored.
     */
-   virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
+   virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
 
-   virtual void Done(string Message,unsigned long Size,string Md5Hash,
+   virtual void Done(std::string Message,unsigned long long Size,std::string Md5Hash,
 		     pkgAcquire::MethodConfig *Cnf);
-   virtual string DescURI() {return RealURI + "Index";};
+   virtual std::string DescURI() {return RealURI + "Index";};
 
    /** \brief Create an index diff item.
     *
@@ -534,10 +542,10 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item
     *  should be ordered so that each diff appears before any diff
     *  that depends on it.
     */
-   pkgAcqIndexDiffs(pkgAcquire *Owner,string URI,string URIDesc,
-		    string ShortDesc, HashString ExpectedHash,
-		    string ServerSha1,
-		    vector<DiffInfo> diffs=vector<DiffInfo>());
+   pkgAcqIndexDiffs(pkgAcquire *Owner,std::string URI,std::string URIDesc,
+		    std::string ShortDesc, HashString ExpectedHash,
+		    std::string ServerSha1,
+		    std::vector<DiffInfo> diffs=std::vector<DiffInfo>());
 };
 									/*}}}*/
 /** \brief An acquire item that is responsible for fetching an index	{{{
@@ -559,6 +567,16 @@ class pkgAcqIndex : public pkgAcquire::Item
     */
    bool Erase;
 
+   /** \brief Verify for correctness by checking if a "Package"
+    *         tag is found in the index. This can be set to
+    *         false for optional index targets
+    *       
+    */
+   // FIXME: instead of a bool it should use a verify string that will
+   //        then be used in the pkgAcqIndex::Done method to ensure that
+   //        the downloaded file contains the expected tag
+   bool Verify;
+
    /** \brief The download request that is currently being
     *   processed.
     */
@@ -567,7 +585,7 @@ class pkgAcqIndex : public pkgAcquire::Item
    /** \brief The object that is actually being fetched (minus any
     *  compression-related extensions).
     */
-   string RealURI;
+   std::string RealURI;
 
    /** \brief The expected hashsum of the decompressed index file. */
    HashString ExpectedHash;
@@ -575,17 +593,17 @@ class pkgAcqIndex : public pkgAcquire::Item
    /** \brief The compression-related file extensions that are being
     *  added to the downloaded file one by one if first fails (e.g., "gz bz2").
     */
-   string CompressionExtension;
+   std::string CompressionExtension;
 
    public:
    
    // Specialized action members
-   virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
-   virtual void Done(string Message,unsigned long Size,string Md5Hash,
+   virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+   virtual void Done(std::string Message,unsigned long long Size,std::string Md5Hash,
 		     pkgAcquire::MethodConfig *Cnf);
-   virtual string Custom600Headers();
-   virtual string DescURI() {return Desc.URI;};
-   virtual string HashSum() {return ExpectedHash.toStr(); };
+   virtual std::string Custom600Headers();
+   virtual std::string DescURI() {return Desc.URI;};
+   virtual std::string HashSum() {return ExpectedHash.toStr(); };
 
    /** \brief Create a pkgAcqIndex.
     *
@@ -606,12 +624,12 @@ class pkgAcqIndex : public pkgAcquire::Item
     *  default is ".lzma" or ".bz2" (if the needed binaries are present)
     *  fallback is ".gz" or none.
     */
-   pkgAcqIndex(pkgAcquire *Owner,string URI,string URIDesc,
-	       string ShortDesc, HashString ExpectedHash, 
-	       string compressExt="");
+   pkgAcqIndex(pkgAcquire *Owner,std::string URI,std::string URIDesc,
+	       std::string ShortDesc, HashString ExpectedHash, 
+	       std::string compressExt="");
    pkgAcqIndex(pkgAcquire *Owner, struct IndexTarget const * const Target,
 			 HashString const &ExpectedHash, indexRecords const *MetaIndexParser);
-   void Init(string const &URI, string const &URIDesc, string const &ShortDesc);
+   void Init(std::string const &URI, std::string const &URIDesc, std::string const &ShortDesc);
 };
 									/*}}}*/
 /** \brief An acquire item that is responsible for fetching a		{{{
@@ -625,8 +643,8 @@ class pkgAcqIndexTrans : public pkgAcqIndex
 {
    public:
   
-   virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
-   virtual string Custom600Headers();
+   virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+   virtual std::string Custom600Headers();
 
    /** \brief Create a pkgAcqIndexTrans.
     *
@@ -639,37 +657,60 @@ class pkgAcqIndexTrans : public pkgAcqIndex
     *
     *  \param ShortDesc A brief description of this index file.
     */
-   pkgAcqIndexTrans(pkgAcquire *Owner,string URI,string URIDesc,
-		    string ShortDesc);
+   pkgAcqIndexTrans(pkgAcquire *Owner,std::string URI,std::string URIDesc,
+		    std::string ShortDesc);
    pkgAcqIndexTrans(pkgAcquire *Owner, struct IndexTarget const * const Target,
 		    HashString const &ExpectedHash, indexRecords const *MetaIndexParser);
 };
 									/*}}}*/
 /** \brief Information about an index file. */				/*{{{*/
-struct IndexTarget
+class IndexTarget
 {
+ public:
    /** \brief A URI from which the index file can be downloaded. */
-   string URI;
+   std::string URI;
 
    /** \brief A description of the index file. */
-   string Description;
+   std::string Description;
 
    /** \brief A shorter description of the index file. */
-   string ShortDesc;
+   std::string ShortDesc;
 
    /** \brief The key by which this index file should be
     *  looked up within the meta signature file.
     */
-   string MetaKey;
-
-   //FIXME: We should use virtual methods here instead…
-   bool IsOptional() const;
-   bool IsSubIndex() const;
+   std::string MetaKey;
+
+   virtual bool IsOptional() const {
+      return false;
+   }
+   virtual bool IsSubIndex() const {
+      return false;
+   }
 };
 									/*}}}*/
 /** \brief Information about an optional index file. */			/*{{{*/
-struct OptionalIndexTarget : public IndexTarget
+class OptionalIndexTarget : public IndexTarget
+{
+   virtual bool IsOptional() const {
+      return true;
+   }
+};
+									/*}}}*/
+/** \brief Information about an subindex index file. */			/*{{{*/
+class SubIndexTarget : public IndexTarget
+{
+   virtual bool IsSubIndex() const {
+      return true;
+   }
+};
+									/*}}}*/
+/** \brief Information about an subindex index file. */			/*{{{*/
+class OptionalSubIndexTarget : public OptionalIndexTarget
 {
+   virtual bool IsSubIndex() const {
+      return true;
+   }
 };
 									/*}}}*/
 
@@ -685,7 +726,7 @@ class pkgAcqMetaSig : public pkgAcquire::Item
 {
    protected:
    /** \brief The last good signature file */
-   string LastGoodSig;
+   std::string LastGoodSig;
 
    /** \brief The fetch request that is currently being processed. */
    pkgAcquire::ItemDesc Desc;
@@ -694,20 +735,20 @@ class pkgAcqMetaSig : public pkgAcquire::Item
     *  never modified; it is used to determine the file that is being
     *  downloaded.
     */
-   string RealURI;
+   std::string RealURI;
 
    /** \brief The URI of the meta-index file to be fetched after the signature. */
-   string MetaIndexURI;
+   std::string MetaIndexURI;
 
    /** \brief A "URI-style" description of the meta-index file to be
     *  fetched after the signature.
     */
-   string MetaIndexURIDesc;
+   std::string MetaIndexURIDesc;
 
    /** \brief A brief description of the meta-index file to be fetched
     *  after the signature.
     */
-   string MetaIndexShortDesc;
+   std::string MetaIndexShortDesc;
 
    /** \brief A package-system-specific parser for the meta-index file. */
    indexRecords* MetaIndexParser;
@@ -717,21 +758,21 @@ class pkgAcqMetaSig : public pkgAcquire::Item
     *
     *  \todo Why a list of pointers instead of a list of structs?
     */
-   const vector<struct IndexTarget*>* IndexTargets;
+   const std::vector<struct IndexTarget*>* IndexTargets;
 
    public:
    
    // Specialized action members
-   virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
-   virtual void Done(string Message,unsigned long Size,string Md5Hash,
+   virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+   virtual void Done(std::string Message,unsigned long long Size,std::string Md5Hash,
 		     pkgAcquire::MethodConfig *Cnf);
-   virtual string Custom600Headers();
-   virtual string DescURI() {return RealURI; };
+   virtual std::string Custom600Headers();
+   virtual std::string DescURI() {return RealURI; };
 
    /** \brief Create a new pkgAcqMetaSig. */
-   pkgAcqMetaSig(pkgAcquire *Owner,string URI,string URIDesc, string ShortDesc,
-		 string MetaIndexURI, string MetaIndexURIDesc, string MetaIndexShortDesc,
-		 const vector<struct IndexTarget*>* IndexTargets,
+   pkgAcqMetaSig(pkgAcquire *Owner,std::string URI,std::string URIDesc, std::string ShortDesc,
+		 std::string MetaIndexURI, std::string MetaIndexURIDesc, std::string MetaIndexShortDesc,
+		 const std::vector<struct IndexTarget*>* IndexTargets,
 		 indexRecords* MetaIndexParser);
 };
 									/*}}}*/
@@ -754,17 +795,17 @@ class pkgAcqMetaIndex : public pkgAcquire::Item
    /** \brief The URI that is actually being downloaded; never
     *  modified by pkgAcqMetaIndex.
     */
-   string RealURI;
+   std::string RealURI;
 
    /** \brief The file in which the signature for this index was stored.
     *
     *  If empty, the signature and the md5sums of the individual
     *  indices will not be checked.
     */
-   string SigFile;
+   std::string SigFile;
 
    /** \brief The index files to download. */
-   const vector<struct IndexTarget*>* IndexTargets;
+   const std::vector<struct IndexTarget*>* IndexTargets;
 
    /** \brief The parser for the meta-index file. */
    indexRecords* MetaIndexParser;
@@ -780,7 +821,7 @@ class pkgAcqMetaIndex : public pkgAcquire::Item
     *
     *  \return \b true if no fatal errors were encountered.
     */
-   bool VerifyVendor(string Message);
+   bool VerifyVendor(std::string Message);
 
    /** \brief Called when a file is finished being retrieved.
     *
@@ -791,7 +832,7 @@ class pkgAcqMetaIndex : public pkgAcquire::Item
     *  \param Message The message block received from the fetch
     *  subprocess.
     */
-   void RetrievalDone(string Message);
+   void RetrievalDone(std::string Message);
 
    /** \brief Called when authentication succeeded.
     *
@@ -802,7 +843,7 @@ class pkgAcqMetaIndex : public pkgAcquire::Item
     *  \param Message The message block received from the fetch
     *  subprocess.
     */
-   void AuthDone(string Message);
+   void AuthDone(std::string Message);
 
    /** \brief Starts downloading the individual index files.
     *
@@ -817,17 +858,17 @@ class pkgAcqMetaIndex : public pkgAcquire::Item
    public:
    
    // Specialized action members
-   virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
-   virtual void Done(string Message,unsigned long Size, string Hash,
+   virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+   virtual void Done(std::string Message,unsigned long long Size, std::string Hash,
 		     pkgAcquire::MethodConfig *Cnf);
-   virtual string Custom600Headers();
-   virtual string DescURI() {return RealURI; };
+   virtual std::string Custom600Headers();
+   virtual std::string DescURI() {return RealURI; };
 
    /** \brief Create a new pkgAcqMetaIndex. */
    pkgAcqMetaIndex(pkgAcquire *Owner,
-		   string URI,string URIDesc, string ShortDesc,
-		   string SigFile,
-		   const vector<struct IndexTarget*>* IndexTargets,
+		   std::string URI,std::string URIDesc, std::string ShortDesc,
+		   std::string SigFile,
+		   const std::vector<struct IndexTarget*>* IndexTargets,
 		   indexRecords* MetaIndexParser);
 };
 									/*}}}*/
@@ -835,33 +876,33 @@ class pkgAcqMetaIndex : public pkgAcquire::Item
 class pkgAcqMetaClearSig : public pkgAcqMetaIndex
 {
    /** \brief The URI of the meta-index file for the detached signature */
-   string MetaIndexURI;
+   std::string MetaIndexURI;
 
    /** \brief A "URI-style" description of the meta-index file */
-   string MetaIndexURIDesc;
+   std::string MetaIndexURIDesc;
 
    /** \brief A brief description of the meta-index file */
-   string MetaIndexShortDesc;
+   std::string MetaIndexShortDesc;
 
    /** \brief The URI of the detached meta-signature file if the clearsigned one failed. */
-   string MetaSigURI;
+   std::string MetaSigURI;
 
    /** \brief A "URI-style" description of the meta-signature file */
-   string MetaSigURIDesc;
+   std::string MetaSigURIDesc;
 
    /** \brief A brief description of the meta-signature file */
-   string MetaSigShortDesc;
+   std::string MetaSigShortDesc;
 
 public:
-   void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
-   virtual string Custom600Headers();
+   void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+   virtual std::string Custom600Headers();
 
    /** \brief Create a new pkgAcqMetaClearSig. */
    pkgAcqMetaClearSig(pkgAcquire *Owner,
-		string const &URI, string const &URIDesc, string const &ShortDesc,
-		string const &MetaIndexURI, string const &MetaIndexURIDesc, string const &MetaIndexShortDesc,
-		string const &MetaSigURI, string const &MetaSigURIDesc, string const &MetaSigShortDesc,
-		const vector<struct IndexTarget*>* IndexTargets,
+		std::string const &URI, std::string const &URIDesc, std::string const &ShortDesc,
+		std::string const &MetaIndexURI, std::string const &MetaIndexURIDesc, std::string const &MetaIndexShortDesc,
+		std::string const &MetaSigURI, std::string const &MetaSigURIDesc, std::string const &MetaSigShortDesc,
+		const std::vector<struct IndexTarget*>* IndexTargets,
 		indexRecords* MetaIndexParser);
 };
 									/*}}}*/
@@ -895,7 +936,7 @@ class pkgAcqArchive : public pkgAcquire::Item
    /** \brief A location in which the actual filename of the package
     *  should be stored.
     */
-   string &StoreFilename;
+   std::string &StoreFilename;
 
    /** \brief The next file for this version to try to download. */
    pkgCache::VerFileIterator Vf;
@@ -917,13 +958,13 @@ class pkgAcqArchive : public pkgAcquire::Item
    
    public:
    
-   virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
-   virtual void Done(string Message,unsigned long Size,string Hash,
+   virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+   virtual void Done(std::string Message,unsigned long long Size,std::string Hash,
 		     pkgAcquire::MethodConfig *Cnf);
-   virtual string DescURI() {return Desc.URI;};
-   virtual string ShortDesc() {return Desc.ShortDesc;};
+   virtual std::string DescURI() {return Desc.URI;};
+   virtual std::string ShortDesc() {return Desc.ShortDesc;};
    virtual void Finished();
-   virtual string HashSum() {return ExpectedHash.toStr(); };
+   virtual std::string HashSum() {return ExpectedHash.toStr(); };
    virtual bool IsTrusted();
    
    /** \brief Create a new pkgAcqArchive.
@@ -946,7 +987,7 @@ class pkgAcqArchive : public pkgAcquire::Item
     */
    pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources,
 		 pkgRecords *Recs,pkgCache::VerIterator const &Version,
-		 string &StoreFilename);
+		 std::string &StoreFilename);
 };
 									/*}}}*/
 /** \brief Retrieve an arbitrary file to the current directory.		{{{
@@ -974,12 +1015,12 @@ class pkgAcqFile : public pkgAcquire::Item
    public:
    
    // Specialized action members
-   virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
-   virtual void Done(string Message,unsigned long Size,string CalcHash,
+   virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+   virtual void Done(std::string Message,unsigned long long Size,std::string CalcHash,
 		     pkgAcquire::MethodConfig *Cnf);
-   virtual string DescURI() {return Desc.URI;};
-   virtual string HashSum() {return ExpectedHash.toStr(); };
-   virtual string Custom600Headers();
+   virtual std::string DescURI() {return Desc.URI;};
+   virtual std::string HashSum() {return ExpectedHash.toStr(); };
+   virtual std::string Custom600Headers();
 
    /** \brief Create a new pkgAcqFile object.
     *
@@ -1012,9 +1053,9 @@ class pkgAcqFile : public pkgAcquire::Item
     * is the absolute name to which the file should be downloaded.
     */
 
-   pkgAcqFile(pkgAcquire *Owner, string URI, string Hash, unsigned long Size,
-	      string Desc, string ShortDesc,
-	      const string &DestDir="", const string &DestFilename="",
+   pkgAcqFile(pkgAcquire *Owner, std::string URI, std::string Hash, unsigned long long Size,
+	      std::string Desc, std::string ShortDesc,
+	      const std::string &DestDir="", const std::string &DestFilename="",
 	      bool IsIndexFile=false);
 };
 									/*}}}*/
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 294d78f86..2041fd9e9 100644
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -15,6 +15,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
@@ -166,6 +168,8 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
       std::cout << "SHA1-Hash: " << Res.SHA1Sum << "\n";
    if (Res.SHA256Sum.empty() == false)
       std::cout << "SHA256-Hash: " << Res.SHA256Sum << "\n";
+   if (Res.SHA512Sum.empty() == false)
+      std::cout << "SHA512-Hash: " << Res.SHA512Sum << "\n";
    if (UsedMirror.empty() == false)
       std::cout << "UsedMirror: " << UsedMirror << "\n";
    if (Res.GPGVOutput.empty() == false)
@@ -199,7 +203,9 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
 	 std::cout << "Alt-SHA1-Hash: " << Alt->SHA1Sum << "\n";
       if (Alt->SHA256Sum.empty() == false)
 	 std::cout << "Alt-SHA256-Hash: " << Alt->SHA256Sum << "\n";
-
+      if (Alt->SHA512Sum.empty() == false)
+         std::cout << "Alt-SHA512-Hash: " << Alt->SHA512Sum << "\n";
+     
       if (Alt->IMSHit == true)
 	 std::cout << "Alt-IMS-Hit: true\n";
    }
@@ -456,5 +462,6 @@ void pkgAcqMethod::FetchResult::TakeHashes(Hashes &Hash)
    MD5Sum = Hash.MD5.Result();
    SHA1Sum = Hash.SHA1.Result();
    SHA256Sum = Hash.SHA256.Result();
+   SHA512Sum = Hash.SHA512.Result();
 }
 									/*}}}*/
diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index 72efa8065..2dd9ad685 100644
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -20,10 +20,15 @@
 #ifndef PKGLIB_ACQUIRE_METHOD_H
 #define PKGLIB_ACQUIRE_METHOD_H
 
+#include <stdarg.h>
+
+#include <string>
+#include <vector>
+
+#ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
-
-#include <stdarg.h>
+#endif
 
 class Hashes;
 class pkgAcqMethod
@@ -34,8 +39,8 @@ class pkgAcqMethod
    {
       FetchItem *Next;
 
-      string Uri;
-      string DestFile;
+      std::string Uri;
+      std::string DestFile;
       time_t LastModified;
       bool IndexFile;
       bool FailIgnore;
@@ -43,40 +48,41 @@ class pkgAcqMethod
    
    struct FetchResult
    {
-      string MD5Sum;
-      string SHA1Sum;
-      string SHA256Sum;
-      vector<string> GPGVOutput;
+      std::string MD5Sum;
+      std::string SHA1Sum;
+      std::string SHA256Sum;
+      std::string SHA512Sum;
+      std::vector<std::string> GPGVOutput;
       time_t LastModified;
       bool IMSHit;
-      string Filename;
-      unsigned long Size;
-      unsigned long ResumePoint;
+      std::string Filename;
+      unsigned long long Size;
+      unsigned long long ResumePoint;
       
       void TakeHashes(Hashes &Hash);
       FetchResult();
    };
 
    // State
-   vector<string> Messages;
+   std::vector<std::string> Messages;
    FetchItem *Queue;
    FetchItem *QueueBack;
-   string FailReason;
-   string UsedMirror;
-   string IP;
+   std::string FailReason;
+   std::string UsedMirror;
+   std::string IP;
    
    // Handlers for messages
-   virtual bool Configuration(string Message);
+   virtual bool Configuration(std::string Message);
    virtual bool Fetch(FetchItem * /*Item*/) {return true;};
    
    // Outgoing messages
    void Fail(bool Transient = false);
-   inline void Fail(const char *Why, bool Transient = false) {Fail(string(Why),Transient);};
-   virtual void Fail(string Why, bool Transient = false);
+   inline void Fail(const char *Why, bool Transient = false) {Fail(std::string(Why),Transient);};
+   virtual void Fail(std::string Why, bool Transient = false);
    virtual void URIStart(FetchResult &Res);
    virtual void URIDone(FetchResult &Res,FetchResult *Alt = 0);
 
-   bool MediaFail(string Required,string Drive);
+   bool MediaFail(std::string Required,std::string Drive);
    virtual void Exit() {};
 
    void PrintStatus(char const * const header, const char* Format, va_list &args) const;
@@ -90,11 +96,11 @@ class pkgAcqMethod
    void Log(const char *Format,...);
    void Status(const char *Format,...);
    
-   void Redirect(const string &NewURI);
+   void Redirect(const std::string &NewURI);
  
    int Run(bool Single = false);
-   inline void SetFailReason(string Msg) {FailReason = Msg;};
-   inline void SetIP(string aIP) {IP = aIP;};
+   inline void SetFailReason(std::string Msg) {FailReason = Msg;};
+   inline void SetIP(std::string aIP) {IP = aIP;};
    
    pkgAcqMethod(const char *Ver,unsigned long Flags = 0);
    virtual ~pkgAcqMethod() {};
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 75e03232a..77e2fc311 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -12,6 +12,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/acquire-worker.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/configuration.h>
@@ -19,18 +21,18 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 
-#include <apti18n.h>
-
 #include <iostream>
 #include <sstream>
 #include <fstream>
-    
+
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
 #include <errno.h>
+
+#include <apti18n.h>
 									/*}}}*/
 
 using namespace std;
@@ -256,9 +258,9 @@ bool pkgAcquire::Worker::RunMessages()
 	    
 	    CurrentItem = Itm;
 	    CurrentSize = 0;
-	    TotalSize = atoi(LookupTag(Message,"Size","0").c_str());
-	    ResumePoint = atoi(LookupTag(Message,"Resume-Point","0").c_str());
-	    Itm->Owner->Start(Message,atoi(LookupTag(Message,"Size","0").c_str()));
+	    TotalSize = strtoull(LookupTag(Message,"Size","0").c_str(), NULL, 10);
+	    ResumePoint = strtoull(LookupTag(Message,"Resume-Point","0").c_str(), NULL, 10);
+	    Itm->Owner->Start(Message,strtoull(LookupTag(Message,"Size","0").c_str(), NULL, 10));
 
 	    // Display update before completion
 	    if (Log != 0 && Log->MorePulses == true)
@@ -287,9 +289,9 @@ bool pkgAcquire::Worker::RunMessages()
 	       Log->Pulse(Owner->GetOwner());
 	    
 	    OwnerQ->ItemDone(Itm);
-	    unsigned long const ServerSize = atol(LookupTag(Message,"Size","0").c_str());
+	    unsigned long long const ServerSize = strtoull(LookupTag(Message,"Size","0").c_str(), NULL, 10);
 	    if (TotalSize != 0 && ServerSize != TotalSize)
-	       _error->Warning("Size of file %s is not what the server reported %s %lu",
+	       _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);
 
 	    // see if there is a hash to verify
@@ -429,7 +431,9 @@ bool pkgAcquire::Worker::MediaChange(string Message)
 	     << Drive  << ":"     // drive
 	     << msg.str()         // l10n message
 	     << endl;
-      write(status_fd, status.str().c_str(), status.str().size());
+
+      std::string const dlstatus = status.str();
+      FileFd::Write(status_fd, dlstatus.c_str(), dlstatus.size());
    }
 
    if (Log == 0 || Log->MediaChange(LookupTag(Message,"Media"),
@@ -528,17 +532,10 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item)
 /* */
 bool pkgAcquire::Worker::OutFdReady()
 {
-   int Res;
-   do
-   {
-      Res = write(OutFd,OutQueue.c_str(),OutQueue.length());
-   }
-   while (Res < 0 && errno == EINTR);
-   
-   if (Res <= 0)
+   if (FileFd::Write(OutFd,OutQueue.c_str(),OutQueue.length()) == false)
       return MethodFailure();
    
-   OutQueue.erase(0,Res);
+   OutQueue.clear();
    if (OutQueue.empty() == true)
       OutReady = false;
    
diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h
index 06283922e..848a6bad7 100644
--- a/apt-pkg/acquire-worker.h
+++ b/apt-pkg/acquire-worker.h
@@ -44,6 +44,9 @@
  */
 class pkgAcquire::Worker : public WeakPointable
 {
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+  
    friend class pkgAcquire;
    
    protected:
@@ -76,7 +79,7 @@ class pkgAcquire::Worker : public WeakPointable
     *
     *  \todo Doesn't this duplicate Config->Access?
     */
-   string Access;
+   std::string Access;
 
    /** \brief The PID of the subprocess. */
    pid_t Process;
@@ -115,13 +118,13 @@ class pkgAcquire::Worker : public WeakPointable
    /** \brief The raw text values of messages received from the
     *  worker, in sequence.
     */
-   vector<string> MessageQueue;
+   std::vector<std::string> MessageQueue;
 
    /** \brief Buffers pending writes to the subprocess.
     *
     *  \todo Wouldn't a std::dequeue be more appropriate?
     */
-   string OutQueue;
+   std::string OutQueue;
    
    /** \brief Common code for the constructor.
     *
@@ -180,7 +183,7 @@ class pkgAcquire::Worker : public WeakPointable
     *
     *  \return \b true.
     */
-   bool Capabilities(string Message);
+   bool Capabilities(std::string Message);
 
    /** \brief Send a 601 Configuration message (containing the APT
     *  configuration) to the subprocess.
@@ -211,7 +214,7 @@ class pkgAcquire::Worker : public WeakPointable
     *  603 Media Changed, with the Failed field set to \b true if the
     *  user cancelled the media change).
     */
-   bool MediaChange(string Message);
+   bool MediaChange(std::string Message);
    
    /** \brief Invoked when the worked process dies unexpectedly.
     *
@@ -239,22 +242,22 @@ class pkgAcquire::Worker : public WeakPointable
    /** \brief The most recent status string received from the
     *  subprocess.
     */
-   string Status;
+   std::string Status;
 
    /** \brief How many bytes of the file have been downloaded.  Zero
     *  if the current progress of the file cannot be determined.
     */
-   unsigned long CurrentSize;
+   unsigned long long CurrentSize;
 
    /** \brief The total number of bytes to be downloaded.  Zero if the
     *  total size of the final is unknown.
     */
-   unsigned long TotalSize;
+   unsigned long long TotalSize;
 
    /** \brief How much of the file was already downloaded prior to
     *  starting this worker.
     */
-   unsigned long ResumePoint;
+   unsigned long long ResumePoint;
    
    /** \brief Tell the subprocess to download the given item.
     *
@@ -314,7 +317,7 @@ class pkgAcquire::Worker : public WeakPointable
     *  Closes the file descriptors; if MethodConfig::NeedsCleanup is
     *  \b false, also rudely interrupts the worker with a SIGINT.
     */
-   ~Worker();
+   virtual ~Worker();
 };
 
 /** @} */
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index ef120d8e9..5e1419056 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -13,6 +13,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/acquire-worker.h>
@@ -21,8 +23,6 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 
-#include <apti18n.h>
-
 #include <iostream>
 #include <sstream>
 #include <stdio.h>
@@ -30,6 +30,8 @@
 #include <dirent.h>
 #include <sys/time.h>
 #include <errno.h>
+
+#include <apti18n.h>
 									/*}}}*/
 
 using namespace std;
@@ -37,9 +39,9 @@ using namespace std;
 // Acquire::pkgAcquire - Constructor					/*{{{*/
 // ---------------------------------------------------------------------
 /* We grab some runtime state from the configuration space */
-pkgAcquire::pkgAcquire() : Queues(0), Workers(0), Configs(0), Log(NULL), ToFetch(0),
+pkgAcquire::pkgAcquire() : LockFD(-1), Queues(0), Workers(0), Configs(0), Log(NULL), ToFetch(0),
 			   Debug(_config->FindB("Debug::pkgAcquire",false)),
-			   Running(false), LockFD(-1)
+			   Running(false)
 {
    string const Mode = _config->Find("Acquire::Queue-Mode","host");
    if (strcasecmp(Mode.c_str(),"host") == 0)
@@ -47,10 +49,10 @@ pkgAcquire::pkgAcquire() : Queues(0), Workers(0), Configs(0), Log(NULL), ToFetch
    if (strcasecmp(Mode.c_str(),"access") == 0)
       QueueMode = QueueAccess;
 }
-pkgAcquire::pkgAcquire(pkgAcquireStatus *Progress) : Queues(0), Workers(0),
+pkgAcquire::pkgAcquire(pkgAcquireStatus *Progress) :  LockFD(-1), Queues(0), Workers(0),
 			   Configs(0), Log(Progress), ToFetch(0),
 			   Debug(_config->FindB("Debug::pkgAcquire",false)),
-			   Running(false), LockFD(-1)
+			   Running(false)
 {
    string const Mode = _config->Find("Acquire::Queue-Mode","host");
    if (strcasecmp(Mode.c_str(),"host") == 0)
@@ -764,7 +766,7 @@ void pkgAcquire::Queue::Bump()
 // AcquireStatus::pkgAcquireStatus - Constructor			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-pkgAcquireStatus::pkgAcquireStatus() : Update(true), MorePulses(false)
+pkgAcquireStatus::pkgAcquireStatus() : d(NULL), Update(true), MorePulses(false)
 {
    Start();
 }
@@ -803,7 +805,7 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner)
    }
    
    // Compute the current completion
-   unsigned long ResumeSize = 0;
+   unsigned long long ResumeSize = 0;
    for (pkgAcquire::Worker *I = Owner->WorkersBegin(); I != 0;
 	I = Owner->WorkerStep(I))
       if (I->CurrentItem != 0 && I->CurrentItem->Owner->Complete == false)
@@ -842,7 +844,7 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner)
       else
 	 CurrentCPS = ((CurrentBytes - ResumeSize) - LastBytes)/Delta;
       LastBytes = CurrentBytes - ResumeSize;
-      ElapsedTime = (unsigned long)Delta;
+      ElapsedTime = (unsigned long long)Delta;
       Time = NewTime;
    }
 
@@ -853,8 +855,9 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner)
 
       char msg[200];
       long i = CurrentItems < TotalItems ? CurrentItems + 1 : CurrentItems;
-      unsigned long ETA =
-	 (unsigned long)((TotalBytes - CurrentBytes) / CurrentCPS);
+      unsigned long long ETA = 0;
+      if(CurrentCPS > 0)
+         ETA = (TotalBytes - CurrentBytes) / CurrentCPS;
 
       // only show the ETA if it makes sense
       if (ETA > 0 && ETA < 172800 /* two days */ )
@@ -869,7 +872,9 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner)
 	     << ":"  << (CurrentBytes/float(TotalBytes)*100.0) 
 	     << ":" << msg 
 	     << endl;
-      write(fd, status.str().c_str(), status.str().size());
+
+      std::string const dlstatus = status.str();
+      FileFd::Write(fd, dlstatus.c_str(), dlstatus.size());
    }
 
    return true;
@@ -910,13 +915,13 @@ void pkgAcquireStatus::Stop()
    else
       CurrentCPS = FetchedBytes/Delta;
    LastBytes = CurrentBytes;
-   ElapsedTime = (unsigned int)Delta;
+   ElapsedTime = (unsigned long long)Delta;
 }
 									/*}}}*/
 // AcquireStatus::Fetched - Called when a byte set has been fetched	/*{{{*/
 // ---------------------------------------------------------------------
 /* This is used to get accurate final transfer rate reporting. */
-void pkgAcquireStatus::Fetched(unsigned long Size,unsigned long Resume)
+void pkgAcquireStatus::Fetched(unsigned long long Size,unsigned long long Resume)
 {   
    FetchedBytes += Size - Resume;
 }
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 9fe0e8a87..3d5d7a4b7 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -72,13 +72,14 @@
 #include <vector>
 #include <string>
 
-using std::vector;
-using std::string;
-
-
 #include <sys/time.h>
 #include <unistd.h>
 
+#ifndef APT_8_CLEANER_HEADERS
+using std::vector;
+using std::string;
+#endif
+
 class pkgAcquireStatus;
 
 /** \brief The core download scheduler.					{{{
@@ -91,6 +92,12 @@ class pkgAcquireStatus;
  */
 class pkgAcquire
 {   
+   private:
+   /** \brief FD of the Lock file we acquire in Setup (if any) */
+   int LockFD;
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+
    public:
    
    class Item;
@@ -101,8 +108,8 @@ class pkgAcquire
    friend class Item;
    friend class Queue;
 
-   typedef vector<Item *>::iterator ItemIterator;
-   typedef vector<Item *>::const_iterator ItemCIterator;
+   typedef std::vector<Item *>::iterator ItemIterator;
+   typedef std::vector<Item *>::const_iterator ItemCIterator;
 
    protected:
    
@@ -111,7 +118,7 @@ class pkgAcquire
     *  This is built monotonically as items are created and only
     *  emptied when the download shuts down.
     */
-   vector<Item *> Items;
+   std::vector<Item *> Items;
    
    /** \brief The head of the list of active queues.
     *
@@ -142,12 +149,7 @@ class pkgAcquire
    /** \brief The progress indicator for this download. */
    pkgAcquireStatus *Log;
 
-   /** \brief The total size of the files which are to be fetched.
-    *
-    *  This is not necessarily the total number of bytes to download
-    *  when, e.g., download resumption and list updates via patches
-    *  are taken into account.
-    */
+   /** \brief The number of files which are to be fetched. */
    unsigned long ToFetch;
 
    // Configurable parameters for the scheduler
@@ -201,7 +203,7 @@ class pkgAcquire
     *  \return the string-name of the queue in which a fetch request
     *  for the given URI should be placed.
     */
-   string QueueName(string URI,MethodConfig const *&Config);
+   std::string QueueName(std::string URI,MethodConfig const *&Config);
 
    /** \brief Build up the set of file descriptors upon which select() should
     *  block.
@@ -247,7 +249,7 @@ class pkgAcquire
     *
     *  \return the method whose name is Access, or \b NULL if no such method exists.
     */
-   MethodConfig *GetConfig(string Access);
+   MethodConfig *GetConfig(std::string Access);
 
    /** \brief Provides information on how a download terminated. */
    enum RunResult {
@@ -318,7 +320,7 @@ class pkgAcquire
     *
     *  \return \b true if the directory exists and is readable.
     */
-   bool Clean(string Dir);
+   bool Clean(std::string Dir);
 
    /** \return the total size in bytes of all the items included in
     *  this download.
@@ -346,7 +348,7 @@ class pkgAcquire
     *  only one Acquire class is in action at the time or an empty string
     *  if no lock file should be used.
     */
-   bool Setup(pkgAcquireStatus *Progress = NULL, string const &Lock = "");
+   bool Setup(pkgAcquireStatus *Progress = NULL, std::string const &Lock = "");
 
    void SetLog(pkgAcquireStatus *Progress) { Log = Progress; }
 
@@ -361,9 +363,6 @@ class pkgAcquire
     */
    virtual ~pkgAcquire();
 
-   private:
-   /** \brief FD of the Lock file we acquire in Setup (if any) */
-   int LockFD;
 };
 
 /** \brief Represents a single download source from which an item
@@ -374,11 +373,11 @@ class pkgAcquire
 struct pkgAcquire::ItemDesc : public WeakPointable
 {
    /** \brief The URI from which to download this item. */
-   string URI;
+   std::string URI;
    /** brief A description of this item. */
-   string Description;
+   std::string Description;
    /** brief A shorter description of this item. */
-   string ShortDesc;
+   std::string ShortDesc;
    /** brief The underlying item which is to be downloaded. */
    Item *Owner;
 };
@@ -393,6 +392,9 @@ class pkgAcquire::Queue
    friend class pkgAcquire::UriIterator;
    friend class pkgAcquire::Worker;
 
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+
    /** \brief The next queue in the pkgAcquire object's list of queues. */
    Queue *Next;
    
@@ -419,7 +421,7 @@ class pkgAcquire::Queue
    };
    
    /** \brief The name of this queue. */
-   string Name;
+   std::string Name;
 
    /** \brief The head of the list of items contained in this queue.
     *
@@ -474,13 +476,13 @@ class pkgAcquire::Queue
     *  \return the first item in the queue whose URI is #URI and that
     *  is being downloaded by #Owner.
     */
-   QItem *FindItem(string URI,pkgAcquire::Worker *Owner);
+   QItem *FindItem(std::string URI,pkgAcquire::Worker *Owner);
 
    /** Presumably this should start downloading an item?
     *
     *  \todo Unimplemented.  Implement it or remove?
     */
-   bool ItemStart(QItem *Itm,unsigned long Size);
+   bool ItemStart(QItem *Itm,unsigned long long Size);
 
    /** \brief Remove the given item from this queue and set its state
     *  to pkgAcquire::Item::StatDone.
@@ -537,17 +539,20 @@ class pkgAcquire::Queue
     *  \param Name The name of the new queue.
     *  \param Owner The download process that owns the new queue.
     */
-   Queue(string Name,pkgAcquire *Owner);
+   Queue(std::string Name,pkgAcquire *Owner);
 
    /** Shut down all the worker processes associated with this queue
     *  and empty the queue.
     */
-   ~Queue();
+   virtual ~Queue();
 };
 									/*}}}*/
 /** \brief Iterates over all the URIs being fetched by a pkgAcquire object.	{{{*/
 class pkgAcquire::UriIterator
 {
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+
    /** The next queue to iterate over. */
    pkgAcquire::Queue *CurQ;
    /** The item that we currently point at. */
@@ -583,11 +588,15 @@ class pkgAcquire::UriIterator
 	 CurQ = CurQ->Next;
       }
    }   
+   virtual ~UriIterator() {};
 };
 									/*}}}*/
 /** \brief Information about the properties of a single acquire method.	{{{*/
 struct pkgAcquire::MethodConfig
 {
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+   
    /** \brief The next link on the acquire method list.
     *
     *  \todo Why not an STL container?
@@ -595,10 +604,10 @@ struct pkgAcquire::MethodConfig
    MethodConfig *Next;
    
    /** \brief The name of this acquire method (e.g., http). */
-   string Access;
+   std::string Access;
 
    /** \brief The implementation version of this acquire method. */
-   string Version;
+   std::string Version;
 
    /** \brief If \b true, only one download queue should be created for this
     *  method.
@@ -636,16 +645,20 @@ struct pkgAcquire::MethodConfig
     *  appropriate.
     */
    MethodConfig();
+
+   /* \brief Destructor, empty currently */
+   virtual ~MethodConfig() {};
 };
 									/*}}}*/
 /** \brief A monitor object for downloads controlled by the pkgAcquire class.	{{{
  *
  *  \todo Why protected members?
- *
- *  \todo Should the double members be uint64_t?
  */
 class pkgAcquireStatus
 {
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+
    protected:
    
    /** \brief The last time at which this monitor object was updated. */
@@ -657,34 +670,34 @@ class pkgAcquireStatus
    /** \brief The number of bytes fetched as of the previous call to
     *  pkgAcquireStatus::Pulse, including local items.
     */
-   double LastBytes;
+   unsigned long long LastBytes;
 
    /** \brief The current rate of download as of the most recent call
     *  to pkgAcquireStatus::Pulse, in bytes per second.
     */
-   double CurrentCPS;
+   unsigned long long CurrentCPS;
 
    /** \brief The number of bytes fetched as of the most recent call
     *  to pkgAcquireStatus::Pulse, including local items.
     */
-   double CurrentBytes;
+   unsigned long long CurrentBytes;
 
    /** \brief The total number of bytes that need to be fetched.
     *
     *  \warning This member is inaccurate, as new items might be
     *  enqueued while the download is in progress!
     */
-   double TotalBytes;
+   unsigned long long TotalBytes;
 
    /** \brief The total number of bytes accounted for by items that
     *  were successfully fetched.
     */
-   double FetchedBytes;
+   unsigned long long FetchedBytes;
 
    /** \brief The amount of time that has elapsed since the download
     *   started.
     */
-   unsigned long ElapsedTime;
+   unsigned long long ElapsedTime;
 
    /** \brief The total number of items that need to be fetched.
     *
@@ -717,7 +730,7 @@ class pkgAcquireStatus
     *
     *  \param ResumePoint How much of the file was already fetched.
     */
-   virtual void Fetched(unsigned long Size,unsigned long ResumePoint);
+   virtual void Fetched(unsigned long long Size,unsigned long long ResumePoint);
    
    /** \brief Invoked when the user should be prompted to change the
     *         inserted removable media.
@@ -736,7 +749,7 @@ class pkgAcquireStatus
     *  \todo This is a horrible blocking monster; it should be CPSed
     *  with prejudice.
     */
-   virtual bool MediaChange(string Media,string Drive) = 0;
+   virtual bool MediaChange(std::string Media,std::string Drive) = 0;
    
    /** \brief Invoked when an item is confirmed to be up-to-date.
 
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 44cba8d92..8beb2d51c 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -14,18 +14,26 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/version.h>
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/acquire-item.h>
-    
-#include <apti18n.h>
+#include <apt-pkg/edsp.h>
+#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/progress.h>
+
 #include <sys/types.h>
 #include <cstdlib>
 #include <algorithm>
 #include <iostream>
+#include <stdio.h>
+
+#include <apti18n.h>
 									/*}}}*/
 using namespace std;
 
@@ -327,6 +335,12 @@ bool pkgFixBroken(pkgDepCache &Cache)
  */
 bool pkgDistUpgrade(pkgDepCache &Cache)
 {
+   std::string const solver = _config->Find("APT::Solver", "internal");
+   if (solver != "internal") {
+      OpTextProgress Prog(*_config);
+      return EDSP::ResolveExternal(solver.c_str(), Cache, false, true, false, &Prog);
+   }
+
    pkgDepCache::ActionGroup group(Cache);
 
    /* Upgrade all installed packages first without autoinst to help the resolver
@@ -379,6 +393,12 @@ bool pkgDistUpgrade(pkgDepCache &Cache)
    to install packages not marked for install */
 bool pkgAllUpgrade(pkgDepCache &Cache)
 {
+   std::string const solver = _config->Find("APT::Solver", "internal");
+   if (solver != "internal") {
+      OpTextProgress Prog(*_config);
+      return EDSP::ResolveExternal(solver.c_str(), Cache, true, false, false, &Prog);
+   }
+
    pkgDepCache::ActionGroup group(Cache);
 
    pkgProblemResolver Fix(&Cache);
@@ -451,11 +471,11 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache)
 // ProblemResolver::pkgProblemResolver - Constructor			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-pkgProblemResolver::pkgProblemResolver(pkgDepCache *pCache) : Cache(*pCache)
+pkgProblemResolver::pkgProblemResolver(pkgDepCache *pCache) : d(NULL), Cache(*pCache)
 {
    // Allocate memory
    unsigned long Size = Cache.Head().PackageCount;
-   Scores = new signed short[Size];
+   Scores = new int[Size];
    Flags = new unsigned char[Size];
    memset(Flags,0,sizeof(*Flags)*Size);
    
@@ -495,20 +515,20 @@ void pkgProblemResolver::MakeScores()
    memset(Scores,0,sizeof(*Scores)*Size);
 
    // Important Required Standard Optional Extra
-   signed short PrioMap[] = {
+   int PrioMap[] = {
       0,
-      (signed short) _config->FindI("pkgProblemResolver::Scores::Important",3),
-      (signed short) _config->FindI("pkgProblemResolver::Scores::Required",2),
-      (signed short) _config->FindI("pkgProblemResolver::Scores::Standard",1),
-      (signed short) _config->FindI("pkgProblemResolver::Scores::Optional",-1),
-      (signed short) _config->FindI("pkgProblemResolver::Scores::Extra",-2)
+      _config->FindI("pkgProblemResolver::Scores::Important",3),
+      _config->FindI("pkgProblemResolver::Scores::Required",2),
+      _config->FindI("pkgProblemResolver::Scores::Standard",1),
+      _config->FindI("pkgProblemResolver::Scores::Optional",-1),
+      _config->FindI("pkgProblemResolver::Scores::Extra",-2)
    };
-   signed short PrioEssentials = _config->FindI("pkgProblemResolver::Scores::Essentials",100);
-   signed short PrioInstalledAndNotObsolete = _config->FindI("pkgProblemResolver::Scores::NotObsolete",1);
-   signed short PrioDepends = _config->FindI("pkgProblemResolver::Scores::Depends",1);
-   signed short PrioRecommends = _config->FindI("pkgProblemResolver::Scores::Recommends",1);
-   signed short AddProtected = _config->FindI("pkgProblemResolver::Scores::AddProtected",10000);
-   signed short AddEssential = _config->FindI("pkgProblemResolver::Scores::AddEssential",5000);
+   int PrioEssentials = _config->FindI("pkgProblemResolver::Scores::Essentials",100);
+   int PrioInstalledAndNotObsolete = _config->FindI("pkgProblemResolver::Scores::NotObsolete",1);
+   int PrioDepends = _config->FindI("pkgProblemResolver::Scores::Depends",1);
+   int PrioRecommends = _config->FindI("pkgProblemResolver::Scores::Recommends",1);
+   int AddProtected = _config->FindI("pkgProblemResolver::Scores::AddProtected",10000);
+   int AddEssential = _config->FindI("pkgProblemResolver::Scores::AddEssential",5000);
 
    if (_config->FindB("Debug::pkgProblemResolver::ShowScores",false) == true)
       clog << "Settings used to calculate pkgProblemResolver::Scores::" << endl
@@ -530,13 +550,14 @@ void pkgProblemResolver::MakeScores()
       if (Cache[I].InstallVer == 0)
 	 continue;
       
-      signed short &Score = Scores[I->ID];
+      int &Score = Scores[I->ID];
       
       /* This is arbitrary, it should be high enough to elevate an
          essantial package above most other packages but low enough
 	 to allow an obsolete essential packages to be removed by
 	 a conflicts on a powerfull normal package (ie libc6) */
-      if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
+      if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential
+	  || (I->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important)
 	 Score += PrioEssentials;
 
       // We transform the priority
@@ -568,7 +589,7 @@ void pkgProblemResolver::MakeScores()
    }   
    
    // Copy the scores to advoid additive looping
-   SPtrArray<signed short> OldScores = new signed short[Size];
+   SPtrArray<int> OldScores = new int[Size];
    memcpy(OldScores,Scores,sizeof(*Scores)*Size);
       
    /* Now we cause 1 level of dependency inheritance, that is we add the 
@@ -611,7 +632,8 @@ void pkgProblemResolver::MakeScores()
    {
       if ((Flags[I->ID] & Protected) != 0)
 	 Scores[I->ID] += AddProtected;
-      if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
+      if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential ||
+          (I->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important)
 	 Scores[I->ID] += AddEssential;
    }
 }
@@ -725,7 +747,20 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
    return true;
 }
 									/*}}}*/
-// ProblemResolver::Resolve - Run the resolution pass			/*{{{*/
+// ProblemResolver::Resolve - calls a resolver to fix the situation	/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool pkgProblemResolver::Resolve(bool BrokenFix)
+{
+   std::string const solver = _config->Find("APT::Solver", "internal");
+   if (solver != "internal") {
+      OpTextProgress Prog(*_config);
+      return EDSP::ResolveExternal(solver.c_str(), Cache, false, false, false, &Prog);
+   }
+   return ResolveInternal(BrokenFix);
+}
+									/*}}}*/
+// ProblemResolver::ResolveInternal - Run the resolution pass		/*{{{*/
 // ---------------------------------------------------------------------
 /* This routines works by calculating a score for each package. The score
    is derived by considering the package's priority and all reverse 
@@ -739,12 +774,10 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
  
    The BrokenFix flag enables a mode where the algorithm tries to 
    upgrade packages to advoid problems. */
-bool pkgProblemResolver::Resolve(bool BrokenFix)
+bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
 {
    pkgDepCache::ActionGroup group(Cache);
 
-   unsigned long Size = Cache.Head().PackageCount;
-
    // Record which packages are marked for install
    bool Again = false;
    do
@@ -774,7 +807,9 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
       clog << "Starting" << endl;
    
    MakeScores();
-   
+
+   unsigned long const Size = Cache.Head().PackageCount;
+
    /* We have to order the packages so that the broken fixing pass 
       operates from highest score to lowest. This prevents problems when
       high score packages cause the removal of lower score packages that
@@ -1065,8 +1100,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
 		  LEnd->Dep = End;
 		  LEnd++;
 		  
-		  if (Start->Type != pkgCache::Dep::Conflicts &&
-		      Start->Type != pkgCache::Dep::Obsoletes)
+		  if (Start.IsNegative() == false)
 		     break;
 	       }
 	    }
@@ -1176,7 +1210,6 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
    return true;
 }
 									/*}}}*/
-
 // ProblemResolver::BreaksInstOrPolicy - Check if the given pkg is broken/*{{{*/
 // ---------------------------------------------------------------------
 /* This checks if the given package is broken either by a hard dependency
@@ -1207,7 +1240,7 @@ bool pkgProblemResolver::InstOrNewPolicyBroken(pkgCache::PkgIterator I)
 
    return false;
 }
-
+									/*}}}*/
 // ProblemResolver::ResolveByKeep - Resolve problems using keep		/*{{{*/
 // ---------------------------------------------------------------------
 /* This is the work horse of the soft upgrade routine. It is very gental 
@@ -1215,6 +1248,21 @@ bool pkgProblemResolver::InstOrNewPolicyBroken(pkgCache::PkgIterator I)
    system was non-broken previously. */
 bool pkgProblemResolver::ResolveByKeep()
 {
+   std::string const solver = _config->Find("APT::Solver", "internal");
+   if (solver != "internal") {
+      OpTextProgress Prog(*_config);
+      return EDSP::ResolveExternal(solver.c_str(), Cache, true, false, false, &Prog);
+   }
+   return ResolveByKeepInternal();
+}
+									/*}}}*/
+// ProblemResolver::ResolveByKeepInternal - Resolve problems using keep	/*{{{*/
+// ---------------------------------------------------------------------
+/* This is the work horse of the soft upgrade routine. It is very gental
+   in that it does not install or remove any packages. It is assumed that the
+   system was non-broken previously. */
+bool pkgProblemResolver::ResolveByKeepInternal()
+{
    pkgDepCache::ActionGroup group(Cache);
 
    unsigned long Size = Cache.Head().PackageCount;
@@ -1384,6 +1432,13 @@ static int PrioComp(const void *A,const void *B)
    if ((L.ParentPkg()->Flags & pkgCache::Flag::Essential) != pkgCache::Flag::Essential &&
        (R.ParentPkg()->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
      return -1;
+
+   if ((L.ParentPkg()->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important &&
+       (R.ParentPkg()->Flags & pkgCache::Flag::Important) != pkgCache::Flag::Important)
+     return 1;
+   if ((L.ParentPkg()->Flags & pkgCache::Flag::Important) != pkgCache::Flag::Important &&
+       (R.ParentPkg()->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important)
+     return -1;
    
    if (L->Priority != R->Priority)
       return R->Priority - L->Priority;
@@ -1398,7 +1453,7 @@ void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List)
    qsort(List,Count,sizeof(*List),PrioComp);
 }
 									/*}}}*/
-// CacheFile::ListUpdate - update the cache files                    	/*{{{*/
+// ListUpdate - update the cache files					/*{{{*/
 // ---------------------------------------------------------------------
 /* This is a simple wrapper to update the cache. it will fetch stuff
  * from the network (or any other sources defined in sources.list)
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 99501bed1..37eacf1f8 100644
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -33,11 +33,15 @@
 
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>
-#include <apt-pkg/acquire.h>
 
 #include <iostream>
 
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/acquire.h>
 using std::ostream;
+#endif
+
+class pkgAcquireStatus;
 
 class pkgSimulate : public pkgPackageManager				/*{{{*/
 {
@@ -63,13 +67,13 @@ class pkgSimulate : public pkgPackageManager				/*{{{*/
    pkgDepCache::ActionGroup group;
    
    // The Actuall installation implementation
-   virtual bool Install(PkgIterator Pkg,string File);
+   virtual bool Install(PkgIterator Pkg,std::string File);
    virtual bool Configure(PkgIterator Pkg);
    virtual bool Remove(PkgIterator Pkg,bool Purge);
 
 private:
    void ShortBreaks();
-   void Describe(PkgIterator iPkg,ostream &out,bool Current,bool Candidate);
+   void Describe(PkgIterator iPkg,std::ostream &out,bool Current,bool Candidate);
    
    public:
 
@@ -78,6 +82,9 @@ private:
 									/*}}}*/
 class pkgProblemResolver						/*{{{*/
 {
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+
    pkgDepCache &Cache;
    typedef pkgCache::PkgIterator PkgIterator;
    typedef pkgCache::VerIterator VerIterator;
@@ -89,7 +96,7 @@ class pkgProblemResolver						/*{{{*/
    enum Flags {Protected = (1 << 0), PreInstalled = (1 << 1),
                Upgradable = (1 << 2), ReInstateTried = (1 << 3),
                ToRemove = (1 << 4)};
-   signed short *Scores;
+   int *Scores;
    unsigned char *Flags;
    bool Debug;
    
@@ -105,6 +112,9 @@ class pkgProblemResolver						/*{{{*/
 
    void MakeScores();
    bool DoUpgrade(pkgCache::PkgIterator Pkg);
+
+   bool ResolveInternal(bool const BrokenFix = false);
+   bool ResolveByKeepInternal();
    
    protected:
    bool InstOrNewPolicyBroken(pkgCache::PkgIterator Pkg);
diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index bc385b2dc..d72b0c5ae 100644
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -8,6 +8,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
@@ -18,6 +20,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <stdio.h>
+#include <fcntl.h>
 
 #include <algorithm>
 #include <string>
@@ -57,10 +60,10 @@ const Configuration::getCompressionTypes(bool const &Cached) {
 		if ((*o).empty() == true)
 			continue;
 		// ignore types we have no method ready to use
-		if (_config->Exists(string("Acquire::CompressionTypes::").append(*o)) == false)
+		if (_config->Exists(std::string("Acquire::CompressionTypes::").append(*o)) == false)
 			continue;
 		// ignore types we have no app ready to use
-		string const appsetting = string("Dir::Bin::").append(*o);
+		std::string const appsetting = std::string("Dir::Bin::").append(*o);
 		if (_config->Exists(appsetting) == true) {
 			std::string const app = _config->FindFile(appsetting.c_str(), "");
 			if (app.empty() == false && FileExists(app) == false)
@@ -81,7 +84,7 @@ const Configuration::getCompressionTypes(bool const &Cached) {
 		if (std::find(types.begin(),types.end(),Types->Tag) != types.end())
 			continue;
 		// ignore types we have no app ready to use
-		string const appsetting = string("Dir::Bin::").append(Types->Value);
+		std::string const appsetting = std::string("Dir::Bin::").append(Types->Value);
 		if (appsetting.empty() == false && _config->Exists(appsetting) == true) {
 			std::string const app = _config->FindFile(appsetting.c_str(), "");
 			if (app.empty() == false && FileExists(app) == false)
@@ -93,7 +96,7 @@ const Configuration::getCompressionTypes(bool const &Cached) {
 	// add the special "uncompressed" type
 	if (std::find(types.begin(), types.end(), "uncompressed") == types.end())
 	{
-		string const uncompr = _config->FindFile("Dir::Bin::uncompressed", "");
+		std::string const uncompr = _config->FindFile("Dir::Bin::uncompressed", "");
 		if (uncompr.empty() == true || FileExists(uncompr) == true)
 			types.push_back("uncompressed");
 	}
@@ -326,29 +329,79 @@ std::vector<std::string> const Configuration::getArchitectures(bool const &Cache
 	// FIXME: It is a bit unclean to have debian specific code here…
 	if (archs.empty() == true) {
 		archs.push_back(arch);
-		string dpkgcall = _config->Find("Dir::Bin::dpkg", "dpkg");
-		std::vector<string> const dpkgoptions = _config->FindVector("DPkg::options");
-		for (std::vector<string>::const_iterator o = dpkgoptions.begin();
-		     o != dpkgoptions.end(); ++o)
-			dpkgcall.append(" ").append(*o);
-		dpkgcall.append(" --print-foreign-architectures 2> /dev/null");
-		FILE *dpkg = popen(dpkgcall.c_str(), "r");
+
+		// Generate the base argument list for dpkg
+		std::vector<const char *> Args;
+		string Tmp = _config->Find("Dir::Bin::dpkg","dpkg");
+		{
+			string const dpkgChrootDir = _config->FindDir("DPkg::Chroot-Directory", "/");
+			size_t dpkgChrootLen = dpkgChrootDir.length();
+			if (dpkgChrootDir != "/" && Tmp.find(dpkgChrootDir) == 0) {
+				if (dpkgChrootDir[dpkgChrootLen - 1] == '/')
+					--dpkgChrootLen;
+				Tmp = Tmp.substr(dpkgChrootLen);
+			}
+		}
+		Args.push_back(Tmp.c_str());
+
+		// Stick in any custom dpkg options
+		::Configuration::Item const *Opts = _config->Tree("DPkg::Options");
+		if (Opts != 0) {
+			Opts = Opts->Child;
+			for (; Opts != 0; Opts = Opts->Next)
+			{
+				if (Opts->Value.empty() == true)
+					continue;
+				Args.push_back(Opts->Value.c_str());
+			}
+		}
+
+		Args.push_back("--print-foreign-architectures");
+		Args.push_back(NULL);
+
+		int external[2] = {-1, -1};
+		if (pipe(external) != 0)
+		{
+			_error->WarningE("getArchitecture", "Can't create IPC pipe for dpkg --print-foreign-architectures");
+			return archs;
+		}
+
+		pid_t dpkgMultiArch = ExecFork();
+		if (dpkgMultiArch == 0) {
+			close(external[0]);
+			std::string const chrootDir = _config->FindDir("DPkg::Chroot-Directory");
+			if (chrootDir != "/" && chroot(chrootDir.c_str()) != 0)
+				_error->WarningE("getArchitecture", "Couldn't chroot into %s for dpkg --print-foreign-architectures", chrootDir.c_str());
+			int const nullfd = open("/dev/null", O_RDONLY);
+			dup2(nullfd, STDIN_FILENO);
+			dup2(external[1], STDOUT_FILENO);
+			dup2(nullfd, STDERR_FILENO);
+			execvp(Args[0], (char**) &Args[0]);
+			_error->WarningE("getArchitecture", "Can't detect foreign architectures supported by dpkg!");
+			_exit(100);
+		}
+		close(external[1]);
+
+		FILE *dpkg = fdopen(external[0], "r");
 		char buf[1024];
 		if(dpkg != NULL) {
-			if (fgets(buf, sizeof(buf), dpkg) != NULL) {
+			while (fgets(buf, sizeof(buf), dpkg) != NULL) {
 				char* arch = strtok(buf, " ");
 				while (arch != NULL) {
 					for (; isspace(*arch) != 0; ++arch);
 					if (arch[0] != '\0') {
 						char const* archend = arch;
 						for (; isspace(*archend) == 0 && *archend != '\0'; ++archend);
-						archs.push_back(string(arch, (archend - arch)));
+						string a(arch, (archend - arch));
+						if (std::find(archs.begin(), archs.end(), a) == archs.end())
+							archs.push_back(a);
 					}
 					arch = strtok(NULL, " ");
 				}
 			}
-			pclose(dpkg);
+			fclose(dpkg);
 		}
+		ExecWait(dpkgMultiArch, "dpkg --print-foreign-architectures", true);
 		return archs;
 	}
 
@@ -379,9 +432,30 @@ bool const Configuration::checkArchitecture(std::string const &Arch) {
 // setDefaultConfigurationForCompressors				/*{{{*/
 void Configuration::setDefaultConfigurationForCompressors() {
 	// Set default application paths to check for optional compression types
-	_config->CndSet("Dir::Bin::lzma", "/usr/bin/lzma");
-	_config->CndSet("Dir::Bin::xz", "/usr/bin/xz");
 	_config->CndSet("Dir::Bin::bzip2", "/bin/bzip2");
+	_config->CndSet("Dir::Bin::xz", "/usr/bin/xz");
+	if (FileExists(_config->FindFile("Dir::Bin::xz")) == true) {
+		_config->Clear("Dir::Bin::lzma");
+		_config->Set("APT::Compressor::lzma::Binary", "xz");
+		if (_config->Exists("APT::Compressor::lzma::CompressArg") == false) {
+			_config->Set("APT::Compressor::lzma::CompressArg::", "--format=lzma");
+			_config->Set("APT::Compressor::lzma::CompressArg::", "-9");
+		}
+		if (_config->Exists("APT::Compressor::lzma::UncompressArg") == false) {
+			_config->Set("APT::Compressor::lzma::UncompressArg::", "--format=lzma");
+			_config->Set("APT::Compressor::lzma::UncompressArg::", "-d");
+		}
+	} else {
+		_config->CndSet("Dir::Bin::lzma", "/usr/bin/lzma");
+		if (_config->Exists("APT::Compressor::lzma::CompressArg") == false) {
+			_config->Set("APT::Compressor::lzma::CompressArg::", "--suffix=");
+			_config->Set("APT::Compressor::lzma::CompressArg::", "-9");
+		}
+		if (_config->Exists("APT::Compressor::lzma::UncompressArg") == false) {
+			_config->Set("APT::Compressor::lzma::UncompressArg::", "--suffix=");
+			_config->Set("APT::Compressor::lzma::UncompressArg::", "-d");
+		}
+	}
 }
 									/*}}}*/
 // getCompressors - Return Vector of usbale compressors			/*{{{*/
@@ -403,12 +477,20 @@ const Configuration::getCompressors(bool const Cached) {
 	compressors.push_back(Compressor(".", "", "", "", "", 1));
 	if (_config->Exists("Dir::Bin::gzip") == false || FileExists(_config->FindFile("Dir::Bin::gzip")) == true)
 		compressors.push_back(Compressor("gzip",".gz","gzip","-9n","-d",2));
+#ifdef HAVE_ZLIB
+	else
+		compressors.push_back(Compressor("gzip",".gz","false", "", "", 2));
+#endif
 	if (_config->Exists("Dir::Bin::bzip2") == false || FileExists(_config->FindFile("Dir::Bin::bzip2")) == true)
 		compressors.push_back(Compressor("bzip2",".bz2","bzip2","-9","-d",3));
-	if (_config->Exists("Dir::Bin::lzma") == false || FileExists(_config->FindFile("Dir::Bin::lzma")) == true)
-		compressors.push_back(Compressor("lzma",".lzma","lzma","-9","-d",4));
+#ifdef HAVE_BZ2
+	else
+		compressors.push_back(Compressor("bzip2",".bz2","false", "", "", 3));
+#endif
 	if (_config->Exists("Dir::Bin::xz") == false || FileExists(_config->FindFile("Dir::Bin::xz")) == true)
-		compressors.push_back(Compressor("xz",".xz","xz","-6","-d",5));
+		compressors.push_back(Compressor("xz",".xz","xz","-6","-d",4));
+	if (_config->Exists("Dir::Bin::lzma") == false || FileExists(_config->FindFile("Dir::Bin::lzma")) == true)
+		compressors.push_back(Compressor("lzma",".lzma","lzma","-9","-d",5));
 
 	std::vector<std::string> const comp = _config->FindVector("APT::Compressor");
 	for (std::vector<std::string>::const_iterator c = comp.begin();
@@ -441,7 +523,7 @@ Configuration::Compressor::Compressor(char const *name, char const *extension,
 				      char const *binary,
 				      char const *compressArg, char const *uncompressArg,
 				      unsigned short const cost) {
-	std::string const config = string("APT:Compressor::").append(name).append("::");
+	std::string const config = std::string("APT::Compressor::").append(name).append("::");
 	Name = _config->Find(std::string(config).append("Name"), name);
 	Extension = _config->Find(std::string(config).append("Extension"), extension);
 	Binary = _config->Find(std::string(config).append("Binary"), binary);
diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index a76cfc08e..7c2276185 100644
--- a/apt-pkg/cachefile.cc
+++ b/apt-pkg/cachefile.cc
@@ -12,6 +12,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/sourcelist.h>
@@ -21,13 +23,14 @@
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/fileutl.h>
-    
+#include <apt-pkg/progress.h>
+
 #include <apti18n.h>
 									/*}}}*/
 // CacheFile::CacheFile - Constructor					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-pkgCacheFile::pkgCacheFile() : Map(NULL), Cache(NULL), DCache(NULL),
+pkgCacheFile::pkgCacheFile() : d(NULL), Map(NULL), Cache(NULL), DCache(NULL),
 				SrcList(NULL), Policy(NULL)
 {
 }
@@ -175,6 +178,40 @@ void pkgCacheFile::RemoveCaches()
       unlink(pkgcache.c_str());
    if (srcpkgcache.empty() == false && RealFileExists(srcpkgcache) == true)
       unlink(srcpkgcache.c_str());
+   if (pkgcache.empty() == false)
+   {
+      std::string cachedir = flNotFile(pkgcache);
+      std::string cachefile = flNotDir(pkgcache);
+      if (cachedir.empty() != true && cachefile.empty() != true && DirectoryExists(cachedir) == true)
+      {
+	 cachefile.append(".");
+	 std::vector<std::string> caches = GetListOfFilesInDir(cachedir, false);
+	 for (std::vector<std::string>::const_iterator file = caches.begin(); file != caches.end(); ++file)
+	 {
+	    std::string nuke = flNotDir(*file);
+	    if (strncmp(cachefile.c_str(), nuke.c_str(), cachefile.length()) != 0)
+	       continue;
+	    unlink(file->c_str());
+	 }
+      }
+   }
+
+   if (srcpkgcache.empty() == true)
+      return;
+
+   std::string cachedir = flNotFile(srcpkgcache);
+   std::string cachefile = flNotDir(srcpkgcache);
+   if (cachedir.empty() == true || cachefile.empty() == true || DirectoryExists(cachedir) == false)
+      return;
+   cachefile.append(".");
+   std::vector<std::string> caches = GetListOfFilesInDir(cachedir, false);
+   for (std::vector<std::string>::const_iterator file = caches.begin(); file != caches.end(); ++file)
+   {
+      std::string nuke = flNotDir(*file);
+      if (strncmp(cachefile.c_str(), nuke.c_str(), cachefile.length()) != 0)
+	 continue;
+      unlink(file->c_str());
+   }
 }
 									/*}}}*/
 // CacheFile::Close - close the cache files				/*{{{*/
diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h
index b4f41c6f4..802b12b61 100644
--- a/apt-pkg/cachefile.h
+++ b/apt-pkg/cachefile.h
@@ -17,14 +17,24 @@
 #ifndef PKGLIB_CACHEFILE_H
 #define PKGLIB_CACHEFILE_H
 
-
 #include <apt-pkg/depcache.h>
+#include <apt-pkg/macros.h>
+
+#ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/policy.h>
 #include <apt-pkg/sourcelist.h>
+#endif
+
+class pkgPolicy;
+class pkgSourceList;
+class OpProgress;
 
 class pkgCacheFile
 {
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+
    protected:
    
    MMap *Map;
diff --git a/apt-pkg/cachefilter.cc b/apt-pkg/cachefilter.cc
index 8f0725ea3..9ec3fa699 100644
--- a/apt-pkg/cachefilter.cc
+++ b/apt-pkg/cachefilter.cc
@@ -4,6 +4,8 @@
     Collection of functor classes */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/cachefilter.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/pkgcache.h>
@@ -16,7 +18,7 @@
 									/*}}}*/
 namespace APT {
 namespace CacheFilter {
-PackageNameMatchesRegEx::PackageNameMatchesRegEx(std::string const &Pattern) {/*{{{*/
+PackageNameMatchesRegEx::PackageNameMatchesRegEx(std::string const &Pattern) : d(NULL) {/*{{{*/
 	pattern = new regex_t;
 	int const Res = regcomp(pattern, Pattern.c_str(), REG_EXTENDED | REG_ICASE | REG_NOSUB);
 	if (Res == 0)
diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h
index e7ab1723f..5d426008b 100644
--- a/apt-pkg/cachefilter.h
+++ b/apt-pkg/cachefilter.h
@@ -16,6 +16,8 @@ namespace APT {
 namespace CacheFilter {
 // PackageNameMatchesRegEx						/*{{{*/
 class PackageNameMatchesRegEx {
+         /** \brief dpointer placeholder (for later in case we need it) */
+         void *d;
 	regex_t* pattern;
 public:
 	PackageNameMatchesRegEx(std::string const &Pattern);
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index 0c9813c6d..d5e018be9 100644
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -32,6 +32,7 @@
 #include<iterator>
 
 #include<string.h>
+
 // abstract Iterator template						/*{{{*/
 /* This template provides the very basic iterator methods we
    need to have for doing some walk-over-the-cache magic */
@@ -111,7 +112,7 @@ class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> {
 
 	inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;};
 	inline PkgIterator PackageList() const;
-	PkgIterator FindPkg(string Arch = "any") const;
+	PkgIterator FindPkg(std::string Arch = "any") const;
 	/** \brief find the package with the "best" architecture
 
 	    The best architecture is either the "native" or the first
@@ -206,15 +207,10 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
 	inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;};
 	inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;};
 	inline const char *Arch() const {
-		if (S->MultiArch == pkgCache::Version::All ||
-		    S->MultiArch == pkgCache::Version::AllForeign ||
-		    S->MultiArch == pkgCache::Version::AllAllowed)
+		if ((S->MultiArch & pkgCache::Version::All) == pkgCache::Version::All)
 			return "all";
 		return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;
 	};
-	__deprecated inline const char *Arch(bool const pseudo) const {
-		return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;
-	};
 	inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);};
 
 	inline DescIterator DescriptionList() const;
@@ -224,10 +220,9 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
 	inline VerFileIterator FileList() const;
 	bool Downloadable() const;
 	inline const char *PriorityType() const {return Owner->Priority(S->Priority);};
-	string RelStr() const;
+	std::string RelStr() const;
 
 	bool Automatic() const;
-	__deprecated bool Pseudo() const;
 	VerFileIterator NewestFile() const;
 
 	inline VerIterator(pkgCache &Owner,Version *Trg = 0) : Iterator<Version, VerIterator>(Owner, Trg) {
@@ -288,6 +283,8 @@ class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> {
 	inline bool Reverse() const {return Type == DepRev;};
 	bool IsCritical() const;
 	bool IsNegative() const;
+	bool IsIgnorable(PrvIterator const &Prv) const;
+	bool IsIgnorable(PkgIterator const &Pkg) const;
 	void GlobOr(DepIterator &Start,DepIterator &End);
 	Version **AllTargets() const;
 	bool SmartTargetPkg(PkgIterator &Result) const;
@@ -371,7 +368,7 @@ class pkgCache::PkgFileIterator : public Iterator<PackageFile, PkgFileIterator>
 	inline const char *IndexType() const {return S->IndexType == 0?0:Owner->StrP + S->IndexType;};
 
 	bool IsOk();
-	string RelStr();
+	std::string RelStr();
 
 	// Constructors
 	inline PkgFileIterator() : Iterator<PackageFile, PkgFileIterator>() {};
diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc
index a1de613e2..b892ab4bf 100644
--- a/apt-pkg/cacheset.cc
+++ b/apt-pkg/cacheset.cc
@@ -9,22 +9,27 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/cachefile.h>
 #include <apt-pkg/cachefilter.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/versionmatch.h>
-
-#include <apti18n.h>
+#include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/policy.h>
 
 #include <vector>
 
 #include <regex.h>
+
+#include <apti18n.h>
 									/*}}}*/
 namespace APT {
 // FromTask - Return all packages in the cache from a specific task	/*{{{*/
-PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) {
+bool PackageContainerInterface::FromTask(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) {
 	size_t const archfound = pattern.find_last_of(':');
 	std::string arch = "native";
 	if (archfound != std::string::npos) {
@@ -33,13 +38,16 @@ PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheS
 	}
 
 	if (pattern[pattern.length() -1] != '^')
-		return APT::PackageSet(TASK);
+		return false;
 	pattern.erase(pattern.length()-1);
 
 	if (unlikely(Cache.GetPkgCache() == 0 || Cache.GetDepCache() == 0))
-		return APT::PackageSet(TASK);
+		return false;
+
+	bool const wasEmpty = pci->empty();
+	if (wasEmpty == true)
+		pci->setConstructor(TASK);
 
-	PackageSet pkgset(TASK);
 	// get the records
 	pkgRecords Recs(Cache);
 
@@ -49,9 +57,10 @@ PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheS
 	snprintf(S, sizeof(S), "^Task:.*[, ]%s([, ]|$)", pattern.c_str());
 	if(regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE) != 0) {
 		_error->Error("Failed to compile task regexp");
-		return pkgset;
+		return false;
 	}
 
+	bool found = false;
 	for (pkgCache::GrpIterator Grp = Cache->GrpBegin(); Grp.end() == false; ++Grp) {
 		pkgCache::PkgIterator Pkg = Grp.FindPkg(arch);
 		if (Pkg.end() == true)
@@ -70,22 +79,33 @@ PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheS
 		if (regexec(&Pattern, buf, 0, 0, 0) != 0)
 			continue;
 
-		pkgset.insert(Pkg);
+		pci->insert(Pkg);
+		helper.showTaskSelection(Pkg, pattern);
+		found = true;
 	}
 	regfree(&Pattern);
 
-	if (pkgset.empty() == true)
-		return helper.canNotFindTask(Cache, pattern);
+	if (found == false) {
+		helper.canNotFindTask(pci, Cache, pattern);
+		pci->setConstructor(UNKNOWN);
+		return false;
+	}
+
+	if (wasEmpty == false && pci->getConstructor() != UNKNOWN)
+		pci->setConstructor(UNKNOWN);
 
-	helper.showTaskSelection(pkgset, pattern);
-	return pkgset;
+	return true;
 }
 									/*}}}*/
 // FromRegEx - Return all packages in the cache matching a pattern	/*{{{*/
-PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) {
+bool PackageContainerInterface::FromRegEx(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) {
 	static const char * const isregex = ".?+*|[^$";
 	if (pattern.find_first_of(isregex) == std::string::npos)
-		return PackageSet(REGEX);
+		return false;
+
+	bool const wasEmpty = pci->empty();
+	if (wasEmpty == true)
+		pci->setConstructor(REGEX);
 
 	size_t archfound = pattern.find_last_of(':');
 	std::string arch = "native";
@@ -98,11 +118,11 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, Cache
 	}
 
 	if (unlikely(Cache.GetPkgCache() == 0))
-		return PackageSet(REGEX);
+		return false;
 
 	APT::CacheFilter::PackageNameMatchesRegEx regexfilter(pattern);
 
-	PackageSet pkgset(REGEX);
+	bool found = false;
 	for (pkgCache::GrpIterator Grp = Cache.GetPkgCache()->GrpBegin(); Grp.end() == false; ++Grp) {
 		if (regexfilter(Grp) == false)
 			continue;
@@ -118,18 +138,25 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, Cache
 				continue;
 		}
 
-		pkgset.insert(Pkg);
+		pci->insert(Pkg);
+		helper.showRegExSelection(Pkg, pattern);
+		found = true;
+	}
+
+	if (found == false) {
+		helper.canNotFindRegEx(pci, Cache, pattern);
+		pci->setConstructor(UNKNOWN);
+		return false;
 	}
 
-	if (pkgset.empty() == true)
-		return helper.canNotFindRegEx(Cache, pattern);
+	if (wasEmpty == false && pci->getConstructor() != UNKNOWN)
+		pci->setConstructor(UNKNOWN);
 
-	helper.showRegExSelection(pkgset, pattern);
-	return pkgset;
+	return true;
 }
 									/*}}}*/
 // FromName - Returns the package defined  by this string		/*{{{*/
-pkgCache::PkgIterator PackageSet::FromName(pkgCacheFile &Cache,
+pkgCache::PkgIterator PackageContainerInterface::FromName(pkgCacheFile &Cache,
 			std::string const &str, CacheSetHelper &helper) {
 	std::string pkg = str;
 	size_t archfound = pkg.find_last_of(':');
@@ -155,167 +182,155 @@ pkgCache::PkgIterator PackageSet::FromName(pkgCacheFile &Cache,
 	return Pkg;
 }
 									/*}}}*/
-// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/
-std::map<unsigned short, PackageSet> PackageSet::GroupedFromCommandLine(
-		pkgCacheFile &Cache, const char **cmdline,
-		std::list<PackageSet::Modifier> const &mods,
-		unsigned short const &fallback, CacheSetHelper &helper) {
-	std::map<unsigned short, PackageSet> pkgsets;
-	for (const char **I = cmdline; *I != 0; ++I) {
-		unsigned short modID = fallback;
-		std::string str = *I;
-		bool modifierPresent = false;
-		for (std::list<PackageSet::Modifier>::const_iterator mod = mods.begin();
-		     mod != mods.end(); ++mod) {
-			size_t const alength = strlen(mod->Alias);
-			switch(mod->Pos) {
-			case PackageSet::Modifier::POSTFIX:
-				if (str.compare(str.length() - alength, alength,
-						mod->Alias, 0, alength) != 0)
-					continue;
-				str.erase(str.length() - alength);
-				modID = mod->ID;
-				break;
-			case PackageSet::Modifier::PREFIX:
-				continue;
-			case PackageSet::Modifier::NONE:
-				continue;
-			}
-			modifierPresent = true;
-			break;
-		}
-		if (modifierPresent == true) {
-			bool const errors = helper.showErrors(false);
-			pkgCache::PkgIterator Pkg = FromName(Cache, *I, helper);
-			helper.showErrors(errors);
-			if (Pkg.end() == false) {
-				pkgsets[fallback].insert(Pkg);
-				continue;
-			}
-		}
-		pkgsets[modID].insert(PackageSet::FromString(Cache, str, helper));
-	}
-	return pkgsets;
-}
-									/*}}}*/
-// FromCommandLine - Return all packages specified on commandline	/*{{{*/
-PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper) {
-	PackageSet pkgset;
-	for (const char **I = cmdline; *I != 0; ++I) {
-		PackageSet pset = FromString(Cache, *I, helper);
-		pkgset.insert(pset.begin(), pset.end());
-	}
-	return pkgset;
-}
-									/*}}}*/
 // FromString - Return all packages matching a specific string		/*{{{*/
-PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, CacheSetHelper &helper) {
+bool PackageContainerInterface::FromString(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string const &str, CacheSetHelper &helper) {
+	bool found = true;
 	_error->PushToStack();
 
-	PackageSet pkgset;
 	pkgCache::PkgIterator Pkg = FromName(Cache, str, helper);
 	if (Pkg.end() == false)
-		pkgset.insert(Pkg);
-	else {
-		pkgset = FromTask(Cache, str, helper);
-		if (pkgset.empty() == true) {
-			pkgset = FromRegEx(Cache, str, helper);
-			if (pkgset.empty() == true)
-				pkgset = helper.canNotFindPackage(Cache, str);
-		}
+		pci->insert(Pkg);
+	else if (FromTask(pci, Cache, str, helper) == false &&
+		 FromRegEx(pci, Cache, str, helper) == false)
+	{
+		helper.canNotFindPackage(pci, Cache, str);
+		found = false;
 	}
 
-	if (pkgset.empty() == false)
+	if (found == true)
 		_error->RevertToStack();
 	else
 		_error->MergeWithStack();
-	return pkgset;
+	return found;
 }
 									/*}}}*/
-// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/
-std::map<unsigned short, VersionSet> VersionSet::GroupedFromCommandLine(
-		pkgCacheFile &Cache, const char **cmdline,
-		std::list<VersionSet::Modifier> const &mods,
-		unsigned short const &fallback, CacheSetHelper &helper) {
-	std::map<unsigned short, VersionSet> versets;
-	for (const char **I = cmdline; *I != 0; ++I) {
-		unsigned short modID = fallback;
-		VersionSet::Version select = VersionSet::NEWEST;
-		std::string str = *I;
-		bool modifierPresent = false;
-		for (std::list<VersionSet::Modifier>::const_iterator mod = mods.begin();
-		     mod != mods.end(); ++mod) {
-			if (modID == fallback && mod->ID == fallback)
-				select = mod->SelectVersion;
-			size_t const alength = strlen(mod->Alias);
-			switch(mod->Pos) {
-			case VersionSet::Modifier::POSTFIX:
-				if (str.compare(str.length() - alength, alength,
-						mod->Alias, 0, alength) != 0)
-					continue;
-				str.erase(str.length() - alength);
-				modID = mod->ID;
-				select = mod->SelectVersion;
-				break;
-			case VersionSet::Modifier::PREFIX:
-				continue;
-			case VersionSet::Modifier::NONE:
+// FromCommandLine - Return all packages specified on commandline	/*{{{*/
+bool PackageContainerInterface::FromCommandLine(PackageContainerInterface * const pci, pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper) {
+	bool found = false;
+	for (const char **I = cmdline; *I != 0; ++I)
+		found |= PackageContainerInterface::FromString(pci, Cache, *I, helper);
+	return found;
+}
+									/*}}}*/
+// FromModifierCommandLine - helper doing the work for PKG:GroupedFromCommandLine	/*{{{*/
+bool PackageContainerInterface::FromModifierCommandLine(unsigned short &modID, PackageContainerInterface * const pci,
+							pkgCacheFile &Cache, const char * cmdline,
+							std::list<Modifier> const &mods, CacheSetHelper &helper) {
+	std::string str = cmdline;
+	bool modifierPresent = false;
+	for (std::list<Modifier>::const_iterator mod = mods.begin();
+	     mod != mods.end(); ++mod) {
+		size_t const alength = strlen(mod->Alias);
+		switch(mod->Pos) {
+		case Modifier::POSTFIX:
+			if (str.compare(str.length() - alength, alength,
+					mod->Alias, 0, alength) != 0)
 				continue;
-			}
-			modifierPresent = true;
+			str.erase(str.length() - alength);
+			modID = mod->ID;
 			break;
+		case Modifier::PREFIX:
+			continue;
+		case Modifier::NONE:
+			continue;
 		}
-
-		if (modifierPresent == true) {
-			bool const errors = helper.showErrors(false);
-			VersionSet const vset = VersionSet::FromString(Cache, std::string(*I), select, helper, true);
-			helper.showErrors(errors);
-			if (vset.empty() == false) {
-				versets[fallback].insert(vset);
+		modifierPresent = true;
+		break;
+	}
+	if (modifierPresent == true) {
+		bool const errors = helper.showErrors(false);
+		pkgCache::PkgIterator Pkg = FromName(Cache, cmdline, helper);
+		helper.showErrors(errors);
+		if (Pkg.end() == false) {
+			pci->insert(Pkg);
+			return true;
+		}
+	}
+	return FromString(pci, Cache, str, helper);
+}
+									/*}}}*/
+// FromModifierCommandLine - helper doing the work for VER:GroupedFromCommandLine	/*{{{*/
+bool VersionContainerInterface::FromModifierCommandLine(unsigned short &modID,
+							VersionContainerInterface * const vci,
+							pkgCacheFile &Cache, const char * cmdline,
+							std::list<Modifier> const &mods,
+							CacheSetHelper &helper) {
+	Version select = NEWEST;
+	std::string str = cmdline;
+	bool modifierPresent = false;
+	unsigned short fallback = modID;
+	for (std::list<Modifier>::const_iterator mod = mods.begin();
+	     mod != mods.end(); ++mod) {
+		if (modID == fallback && mod->ID == fallback)
+			select = mod->SelectVersion;
+		size_t const alength = strlen(mod->Alias);
+		switch(mod->Pos) {
+		case Modifier::POSTFIX:
+			if (str.compare(str.length() - alength, alength,
+					mod->Alias, 0, alength) != 0)
 				continue;
-			}
+			str.erase(str.length() - alength);
+			modID = mod->ID;
+			select = mod->SelectVersion;
+			break;
+		case Modifier::PREFIX:
+			continue;
+		case Modifier::NONE:
+			continue;
 		}
-		versets[modID].insert(VersionSet::FromString(Cache, str, select , helper));
+		modifierPresent = true;
+		break;
 	}
-	return versets;
+
+	if (modifierPresent == true) {
+		bool const errors = helper.showErrors(false);
+		bool const found = VersionContainerInterface::FromString(vci, Cache, cmdline, select, helper, true);
+		helper.showErrors(errors);
+		if (found == true)
+			return true;
+	}
+	return FromString(vci, Cache, str, select, helper);
 }
 									/*}}}*/
 // FromCommandLine - Return all versions specified on commandline	/*{{{*/
-APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline,
-		APT::VersionSet::Version const &fallback, CacheSetHelper &helper) {
-	VersionSet verset;
+bool VersionContainerInterface::FromCommandLine(VersionContainerInterface * const vci,
+						pkgCacheFile &Cache, const char **cmdline,
+						Version const &fallback, CacheSetHelper &helper) {
+	bool found = false;
 	for (const char **I = cmdline; *I != 0; ++I)
-		verset.insert(VersionSet::FromString(Cache, *I, fallback, helper));
-	return verset;
+		found |= VersionContainerInterface::FromString(vci, Cache, *I, fallback, helper);
+	return found;
 }
 									/*}}}*/
 // FromString - Returns all versions spedcified by a string		/*{{{*/
-APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg,
-		APT::VersionSet::Version const &fallback, CacheSetHelper &helper,
-		bool const &onlyFromName) {
+bool VersionContainerInterface::FromString(VersionContainerInterface * const vci,
+					   pkgCacheFile &Cache, std::string pkg,
+					   Version const &fallback, CacheSetHelper &helper,
+					   bool const onlyFromName) {
 	std::string ver;
 	bool verIsRel = false;
 	size_t const vertag = pkg.find_last_of("/=");
-	if (vertag != string::npos) {
+	if (vertag != std::string::npos) {
 		ver = pkg.substr(vertag+1);
 		verIsRel = (pkg[vertag] == '/');
 		pkg.erase(vertag);
 	}
 	PackageSet pkgset;
 	if (onlyFromName == false)
-		pkgset = PackageSet::FromString(Cache, pkg, helper);
+		PackageContainerInterface::FromString(&pkgset, Cache, pkg, helper);
 	else {
-		pkgset.insert(PackageSet::FromName(Cache, pkg, helper));
+		pkgset.insert(PackageContainerInterface::FromName(Cache, pkg, helper));
 	}
 
-	VersionSet verset;
 	bool errors = true;
 	if (pkgset.getConstructor() != PackageSet::UNKNOWN)
 		errors = helper.showErrors(false);
+
+	bool found = false;
 	for (PackageSet::const_iterator P = pkgset.begin();
 	     P != pkgset.end(); ++P) {
-		if (vertag == string::npos) {
-			verset.insert(VersionSet::FromPackage(Cache, P, fallback, helper));
+		if (vertag == std::string::npos) {
+			found |= VersionContainerInterface::FromPackage(vci, Cache, P, fallback, helper);
 			continue;
 		}
 		pkgCache::VerIterator V;
@@ -345,75 +360,78 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg,
 		if (V.end() == true)
 			continue;
 		helper.showSelectedVersion(P, V, ver, verIsRel);
-		verset.insert(V);
+		vci->insert(V);
+		found = true;
 	}
 	if (pkgset.getConstructor() != PackageSet::UNKNOWN)
 		helper.showErrors(errors);
-	return verset;
+	return found;
 }
 									/*}}}*/
 // FromPackage - versions from package based on fallback		/*{{{*/
-VersionSet VersionSet::FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P,
-		VersionSet::Version const &fallback, CacheSetHelper &helper) {
-	VersionSet verset;
+bool VersionContainerInterface::FromPackage(VersionContainerInterface * const vci,
+					    pkgCacheFile &Cache,
+					    pkgCache::PkgIterator const &P,
+					    Version const &fallback,
+					    CacheSetHelper &helper) {
 	pkgCache::VerIterator V;
 	bool showErrors;
+	bool found = false;
 	switch(fallback) {
-	case VersionSet::ALL:
+	case ALL:
 		if (P->VersionList != 0)
 			for (V = P.VersionList(); V.end() != true; ++V)
-				verset.insert(V);
+				found |= vci->insert(V);
 		else
-			verset.insert(helper.canNotFindAllVer(Cache, P));
+			helper.canNotFindAllVer(vci, Cache, P);
 		break;
-	case VersionSet::CANDANDINST:
-		verset.insert(getInstalledVer(Cache, P, helper));
-		verset.insert(getCandidateVer(Cache, P, helper));
+	case CANDANDINST:
+		found |= vci->insert(getInstalledVer(Cache, P, helper));
+		found |= vci->insert(getCandidateVer(Cache, P, helper));
 		break;
-	case VersionSet::CANDIDATE:
-		verset.insert(getCandidateVer(Cache, P, helper));
+	case CANDIDATE:
+		found |= vci->insert(getCandidateVer(Cache, P, helper));
 		break;
-	case VersionSet::INSTALLED:
-		verset.insert(getInstalledVer(Cache, P, helper));
+	case INSTALLED:
+		found |= vci->insert(getInstalledVer(Cache, P, helper));
 		break;
-	case VersionSet::CANDINST:
+	case CANDINST:
 		showErrors = helper.showErrors(false);
 		V = getCandidateVer(Cache, P, helper);
 		if (V.end() == true)
 			V = getInstalledVer(Cache, P, helper);
 		helper.showErrors(showErrors);
 		if (V.end() == false)
-			verset.insert(V);
+			found |= vci->insert(V);
 		else
-			verset.insert(helper.canNotFindInstCandVer(Cache, P));
+			helper.canNotFindInstCandVer(vci, Cache, P);
 		break;
-	case VersionSet::INSTCAND:
+	case INSTCAND:
 		showErrors = helper.showErrors(false);
 		V = getInstalledVer(Cache, P, helper);
 		if (V.end() == true)
 			V = getCandidateVer(Cache, P, helper);
 		helper.showErrors(showErrors);
 		if (V.end() == false)
-			verset.insert(V);
+			found |= vci->insert(V);
 		else
-			verset.insert(helper.canNotFindInstCandVer(Cache, P));
+			helper.canNotFindInstCandVer(vci, Cache, P);
 		break;
-	case VersionSet::NEWEST:
+	case NEWEST:
 		if (P->VersionList != 0)
-			verset.insert(P.VersionList());
+			found |= vci->insert(P.VersionList());
 		else
-			verset.insert(helper.canNotFindNewestVer(Cache, P));
+			helper.canNotFindNewestVer(Cache, P);
 		break;
 	}
-	return verset;
+	return found;
 }
 									/*}}}*/
 // getCandidateVer - Returns the candidate version of the given package	/*{{{*/
-pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache,
+pkgCache::VerIterator VersionContainerInterface::getCandidateVer(pkgCacheFile &Cache,
 		pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper) {
 	pkgCache::VerIterator Cand;
-	if (Cache.IsPolicyBuilt() == true || Cache.IsDepCacheBuilt() == false)
-	{
+	if (Cache.IsPolicyBuilt() == true || Cache.IsDepCacheBuilt() == false) {
 		if (unlikely(Cache.GetPolicy() == 0))
 			return pkgCache::VerIterator(Cache);
 		Cand = Cache.GetPolicy()->GetCandidateVer(Pkg);
@@ -426,13 +444,14 @@ pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache,
 }
 									/*}}}*/
 // getInstalledVer - Returns the installed version of the given package	/*{{{*/
-pkgCache::VerIterator VersionSet::getInstalledVer(pkgCacheFile &Cache,
+pkgCache::VerIterator VersionContainerInterface::getInstalledVer(pkgCacheFile &Cache,
 		pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper) {
 	if (Pkg->CurrentVer == 0)
 		return helper.canNotFindInstalledVer(Cache, Pkg);
 	return Pkg.CurrentVer();
 }
 									/*}}}*/
+
 // canNotFindPkgName - handle the case no package has this name		/*{{{*/
 pkgCache::PkgIterator CacheSetHelper::canNotFindPkgName(pkgCacheFile &Cache,
 			std::string const &str) {
@@ -442,46 +461,40 @@ pkgCache::PkgIterator CacheSetHelper::canNotFindPkgName(pkgCacheFile &Cache,
 }
 									/*}}}*/
 // canNotFindTask - handle the case no package is found for a task	/*{{{*/
-PackageSet CacheSetHelper::canNotFindTask(pkgCacheFile &Cache, std::string pattern) {
+void CacheSetHelper::canNotFindTask(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern) {
 	if (ShowError == true)
 		_error->Insert(ErrorType, _("Couldn't find task '%s'"), pattern.c_str());
-	return PackageSet();
 }
 									/*}}}*/
 // canNotFindRegEx - handle the case no package is found by a regex	/*{{{*/
-PackageSet CacheSetHelper::canNotFindRegEx(pkgCacheFile &Cache, std::string pattern) {
+void CacheSetHelper::canNotFindRegEx(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern) {
 	if (ShowError == true)
 		_error->Insert(ErrorType, _("Couldn't find any package by regex '%s'"), pattern.c_str());
-	return PackageSet();
 }
 									/*}}}*/
 // canNotFindPackage - handle the case no package is found from a string/*{{{*/
-PackageSet CacheSetHelper::canNotFindPackage(pkgCacheFile &Cache, std::string const &str) {
-	return PackageSet();
+void CacheSetHelper::canNotFindPackage(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string const &str) {
 }
 									/*}}}*/
 // canNotFindAllVer							/*{{{*/
-VersionSet CacheSetHelper::canNotFindAllVer(pkgCacheFile &Cache,
+void CacheSetHelper::canNotFindAllVer(VersionContainerInterface * const vci, pkgCacheFile &Cache,
 		pkgCache::PkgIterator const &Pkg) {
 	if (ShowError == true)
 		_error->Insert(ErrorType, _("Can't select versions from package '%s' as it is purely virtual"), Pkg.FullName(true).c_str());
-	return VersionSet();
 }
 									/*}}}*/
 // canNotFindInstCandVer						/*{{{*/
-VersionSet CacheSetHelper::canNotFindInstCandVer(pkgCacheFile &Cache,
+void CacheSetHelper::canNotFindInstCandVer(VersionContainerInterface * const vci, pkgCacheFile &Cache,
 		pkgCache::PkgIterator const &Pkg) {
 	if (ShowError == true)
 		_error->Insert(ErrorType, _("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str());
-	return VersionSet();
 }
 									/*}}}*/
 // canNotFindInstCandVer						/*{{{*/
-VersionSet CacheSetHelper::canNotFindCandInstVer(pkgCacheFile &Cache,
+void CacheSetHelper::canNotFindCandInstVer(VersionContainerInterface * const vci, pkgCacheFile &Cache,
 		pkgCache::PkgIterator const &Pkg) {
 	if (ShowError == true)
 		_error->Insert(ErrorType, _("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str());
-	return VersionSet();
 }
 									/*}}}*/
 // canNotFindNewestVer							/*{{{*/
@@ -508,4 +521,21 @@ pkgCache::VerIterator CacheSetHelper::canNotFindInstalledVer(pkgCacheFile &Cache
 	return pkgCache::VerIterator(Cache, 0);
 }
 									/*}}}*/
+// showTaskSelection							/*{{{*/
+void CacheSetHelper::showTaskSelection(pkgCache::PkgIterator const &pkg,
+				       std::string const &pattern) {
+}
+									/*}}}*/
+// showRegExSelection							/*{{{*/
+void CacheSetHelper::showRegExSelection(pkgCache::PkgIterator const &pkg,
+					std::string const &pattern) {
+}
+									/*}}}*/
+// showSelectedVersion							/*{{{*/
+void CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const &Pkg,
+					 pkgCache::VerIterator const Ver,
+					 std::string const &ver,
+					 bool const verIsRel) {
+}
+									/*}}}*/
 }
diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h
index eb4f04d72..6f0a0e358 100644
--- a/apt-pkg/cacheset.h
+++ b/apt-pkg/cacheset.h
@@ -14,14 +14,24 @@
 #include <list>
 #include <map>
 #include <set>
+#include <list>
 #include <string>
+#include <iterator>
 
-#include <apt-pkg/cachefile.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/pkgcache.h>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/cachefile.h>
+#endif
 									/*}}}*/
+
+class pkgCacheFile;
+
 namespace APT {
-class PackageSet;
-class VersionSet;
+class PackageContainerInterface;
+class VersionContainerInterface;
+
 class CacheSetHelper {							/*{{{*/
 /** \class APT::CacheSetHelper
     Simple base class with a lot of virtual methods which can be overridden
@@ -32,25 +42,28 @@ class CacheSetHelper {							/*{{{*/
     printed out.
 */
 public:									/*{{{*/
-	CacheSetHelper(bool const &ShowError = true,
+	CacheSetHelper(bool const ShowError = true,
 		GlobalError::MsgType ErrorType = GlobalError::ERROR) :
 			ShowError(ShowError), ErrorType(ErrorType) {};
 	virtual ~CacheSetHelper() {};
 
-	virtual void showTaskSelection(PackageSet const &pkgset, string const &pattern) {};
-	virtual void showRegExSelection(PackageSet const &pkgset, string const &pattern) {};
+	virtual void showTaskSelection(pkgCache::PkgIterator const &pkg, std::string const &pattern);
+	virtual void showRegExSelection(pkgCache::PkgIterator const &pkg, std::string const &pattern);
 	virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver,
-				 string const &ver, bool const &verIsRel) {};
+				 std::string const &ver, bool const verIsRel);
 
-	virtual pkgCache::PkgIterator canNotFindPkgName(pkgCacheFile &Cache, std::string const &str);
-	virtual PackageSet canNotFindTask(pkgCacheFile &Cache, std::string pattern);
-	virtual PackageSet canNotFindRegEx(pkgCacheFile &Cache, std::string pattern);
-	virtual PackageSet canNotFindPackage(pkgCacheFile &Cache, std::string const &str);
-	virtual VersionSet canNotFindAllVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg);
-	virtual VersionSet canNotFindInstCandVer(pkgCacheFile &Cache,
+	virtual void canNotFindTask(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern);
+	virtual void canNotFindRegEx(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern);
+	virtual void canNotFindPackage(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string const &str);
+
+	virtual void canNotFindAllVer(VersionContainerInterface * const vci, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg);
+	virtual void canNotFindInstCandVer(VersionContainerInterface * const vci, pkgCacheFile &Cache,
 				pkgCache::PkgIterator const &Pkg);
-	virtual VersionSet canNotFindCandInstVer(pkgCacheFile &Cache,
+	virtual void canNotFindCandInstVer(VersionContainerInterface * const vci,
+				pkgCacheFile &Cache,
 				pkgCache::PkgIterator const &Pkg);
+
+	virtual pkgCache::PkgIterator canNotFindPkgName(pkgCacheFile &Cache, std::string const &str);
 	virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache,
 				pkgCache::PkgIterator const &Pkg);
 	virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache,
@@ -59,7 +72,7 @@ public:									/*{{{*/
 				pkgCache::PkgIterator const &Pkg);
 
 	bool showErrors() const { return ShowError; };
-	bool showErrors(bool const &newValue) { if (ShowError == newValue) return ShowError; else return ((ShowError = newValue) == false); };
+	bool showErrors(bool const newValue) { if (ShowError == newValue) return ShowError; else return ((ShowError = newValue) == false); };
 	GlobalError::MsgType errorType() const { return ErrorType; };
 	GlobalError::MsgType errorType(GlobalError::MsgType const &newValue)
 	{
@@ -76,53 +89,138 @@ protected:
 	bool ShowError;
 	GlobalError::MsgType ErrorType;
 };									/*}}}*/
-class PackageSet : public std::set<pkgCache::PkgIterator> {		/*{{{*/
-/** \class APT::PackageSet
-
-    Simple wrapper around a std::set to provide a similar interface to
-    a set of packages as to the complete set of all packages in the
-    pkgCache. */
-public:									/*{{{*/
-	/** \brief smell like a pkgCache::PkgIterator */
-	class const_iterator : public std::set<pkgCache::PkgIterator>::const_iterator {/*{{{*/
+class PackageContainerInterface {					/*{{{*/
+/** \class PackageContainerInterface
+
+ * Interface ensuring that all operations can be executed on the yet to
+ * define concrete PackageContainer - access to all methods is possible,
+ * but in general the wrappers provided by the PackageContainer template
+ * are nicer to use.
+
+ * This class mostly protects use from the need to write all implementation
+ * of the methods working on containers in the template */
+public:
+	class const_iterator {						/*{{{*/
 	public:
-		const_iterator(std::set<pkgCache::PkgIterator>::const_iterator x) :
-			 std::set<pkgCache::PkgIterator>::const_iterator(x) {}
-
-		operator pkgCache::PkgIterator(void) { return **this; }
-
-		inline const char *Name() const {return (**this).Name(); }
-		inline std::string FullName(bool const &Pretty) const { return (**this).FullName(Pretty); }
-		inline std::string FullName() const { return (**this).FullName(); }
-		inline const char *Section() const {return (**this).Section(); }
-		inline bool Purge() const {return (**this).Purge(); }
-		inline const char *Arch() const {return (**this).Arch(); }
-		inline pkgCache::GrpIterator Group() const { return (**this).Group(); }
-		inline pkgCache::VerIterator VersionList() const { return (**this).VersionList(); }
-		inline pkgCache::VerIterator CurrentVer() const { return (**this).CurrentVer(); }
-		inline pkgCache::DepIterator RevDependsList() const { return (**this).RevDependsList(); }
-		inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); }
-		inline pkgCache::PkgIterator::OkState State() const { return (**this).State(); }
-		inline const char *CandVersion() const { return (**this).CandVersion(); }
-		inline const char *CurVersion() const { return (**this).CurVersion(); }
-		inline pkgCache *Cache() const { return (**this).Cache(); };
-		inline unsigned long Index() const {return (**this).Index();};
+		virtual pkgCache::PkgIterator getPkg() const = 0;
+		operator pkgCache::PkgIterator(void) const { return getPkg(); }
+
+		inline const char *Name() const {return getPkg().Name(); }
+		inline std::string FullName(bool const Pretty) const { return getPkg().FullName(Pretty); }
+		inline std::string FullName() const { return getPkg().FullName(); }
+		inline const char *Section() const {return getPkg().Section(); }
+		inline bool Purge() const {return getPkg().Purge(); }
+		inline const char *Arch() const {return getPkg().Arch(); }
+		inline pkgCache::GrpIterator Group() const { return getPkg().Group(); }
+		inline pkgCache::VerIterator VersionList() const { return getPkg().VersionList(); }
+		inline pkgCache::VerIterator CurrentVer() const { return getPkg().CurrentVer(); }
+		inline pkgCache::DepIterator RevDependsList() const { return getPkg().RevDependsList(); }
+		inline pkgCache::PrvIterator ProvidesList() const { return getPkg().ProvidesList(); }
+		inline pkgCache::PkgIterator::OkState State() const { return getPkg().State(); }
+		inline const char *CandVersion() const { return getPkg().CandVersion(); }
+		inline const char *CurVersion() const { return getPkg().CurVersion(); }
+		inline pkgCache *Cache() const { return getPkg().Cache(); };
+		inline unsigned long Index() const {return getPkg().Index();};
 		// we have only valid iterators here
 		inline bool end() const { return false; };
 
-		friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, (*i)); }
+		inline pkgCache::Package const * operator->() const {return &*getPkg();};
+	};
+									/*}}}*/
+
+	virtual bool insert(pkgCache::PkgIterator const &P) = 0;
+	virtual bool empty() const = 0;
+	virtual void clear() = 0;
 
-		inline pkgCache::Package const * operator->() const {
-			return &***this;
-		};
+	enum Constructor { UNKNOWN, REGEX, TASK };
+	virtual void setConstructor(Constructor const &con) = 0;
+	virtual Constructor getConstructor() const = 0;
+
+	static bool FromTask(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper);
+	static bool FromRegEx(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper);
+	static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &pattern, CacheSetHelper &helper);
+	static bool FromString(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string const &pattern, CacheSetHelper &helper);
+	static bool FromCommandLine(PackageContainerInterface * const pci, pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper);
+
+	struct Modifier {
+		enum Position { NONE, PREFIX, POSTFIX };
+		unsigned short ID;
+		const char * const Alias;
+		Position Pos;
+		Modifier (unsigned short const &id, const char * const alias, Position const &pos) : ID(id), Alias(alias), Pos(pos) {};
+	};
+
+	static bool FromModifierCommandLine(unsigned short &modID, PackageContainerInterface * const pci,
+					    pkgCacheFile &Cache, const char * cmdline,
+					    std::list<Modifier> const &mods, CacheSetHelper &helper);
+};
+									/*}}}*/
+template<class Container> class PackageContainer : public PackageContainerInterface {/*{{{*/
+/** \class APT::PackageContainer
+
+    Simple wrapper around a container class like std::set to provide a similar
+    interface to a set of packages as to the complete set of all packages in the
+    pkgCache. */
+	Container _cont;
+public:									/*{{{*/
+	/** \brief smell like a pkgCache::PkgIterator */
+	class const_iterator : public PackageContainerInterface::const_iterator,/*{{{*/
+			       public std::iterator<std::forward_iterator_tag, typename Container::const_iterator> {
+		typename Container::const_iterator _iter;
+	public:
+		const_iterator(typename Container::const_iterator i) : _iter(i) {}
+		pkgCache::PkgIterator getPkg(void) const { return *_iter; }
+		inline pkgCache::PkgIterator operator*(void) const { return *_iter; };
+		operator typename Container::const_iterator(void) const { return _iter; }
+		inline const_iterator& operator++() { ++_iter; return *this; }
+		inline const_iterator operator++(int) { const_iterator tmp(*this); operator++(); return tmp; }
+		inline bool operator!=(const_iterator const &i) const { return _iter != i._iter; };
+		inline bool operator==(const_iterator const &i) const { return _iter == i._iter; };
+		friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, *i); }
+	};
+	class iterator : public PackageContainerInterface::const_iterator,
+			 public std::iterator<std::forward_iterator_tag, typename Container::iterator> {
+		typename Container::iterator _iter;
+	public:
+		iterator(typename Container::iterator i) : _iter(i) {}
+		pkgCache::PkgIterator getPkg(void) const { return *_iter; }
+		inline pkgCache::PkgIterator operator*(void) const { return *_iter; };
+		operator typename Container::iterator(void) const { return _iter; }
+		operator typename PackageContainer<Container>::const_iterator() { return PackageContainer<Container>::const_iterator(_iter); }
+		inline iterator& operator++() { ++_iter; return *this; }
+		inline iterator operator++(int) { iterator tmp(*this); operator++(); return tmp; }
+		inline bool operator!=(iterator const &i) const { return _iter != i._iter; };
+		inline bool operator==(iterator const &i) const { return _iter == i._iter; };
+		inline iterator& operator=(iterator const &i) { _iter = i._iter; return *this; };
+		inline iterator& operator=(typename Container::iterator const &i) { _iter = i; return *this; };
+		friend std::ostream& operator<<(std::ostream& out, iterator i) { return operator<<(out, *i); }
 	};
-	// 103. set::iterator is required to be modifiable, but this allows modification of keys
-	typedef APT::PackageSet::const_iterator iterator;
 									/*}}}*/
 
-	using std::set<pkgCache::PkgIterator>::insert;
-	inline void insert(pkgCache::PkgIterator const &P) { if (P.end() == false) std::set<pkgCache::PkgIterator>::insert(P); };
-	inline void insert(PackageSet const &pkgset) { insert(pkgset.begin(), pkgset.end()); };
+	bool insert(pkgCache::PkgIterator const &P) { if (P.end() == true) return false; _cont.insert(P); return true; };
+	template<class Cont> void insert(PackageContainer<Cont> const &pkgcont) { _cont.insert((typename Cont::const_iterator)pkgcont.begin(), (typename Cont::const_iterator)pkgcont.end()); };
+	void insert(const_iterator begin, const_iterator end) { _cont.insert(begin, end); };
+
+	bool empty() const { return _cont.empty(); };
+	void clear() { return _cont.clear(); };
+	//FIXME: on ABI break, replace the first with the second without bool
+	void erase(iterator position) { _cont.erase((typename Container::iterator)position); };
+	iterator& erase(iterator &position, bool) { return position = _cont.erase((typename Container::iterator)position); };
+	size_t erase(const pkgCache::PkgIterator x) { return _cont.erase(x); };
+	void erase(iterator first, iterator last) { _cont.erase(first, last); };
+	size_t size() const { return _cont.size(); };
+
+	const_iterator begin() const { return const_iterator(_cont.begin()); };
+	const_iterator end() const { return const_iterator(_cont.end()); };
+	iterator begin() { return iterator(_cont.begin()); };
+	iterator end() { return iterator(_cont.end()); };
+	const_iterator find(pkgCache::PkgIterator const &P) const { return const_iterator(_cont.find(P)); };
+
+	void setConstructor(Constructor const &by) { ConstructedBy = by; };
+	Constructor getConstructor() const { return ConstructedBy; };
+
+	PackageContainer() : ConstructedBy(UNKNOWN) {};
+	PackageContainer(Constructor const &by) : ConstructedBy(by) {};
 
 	/** \brief returns all packages in the cache who belong to the given task
 
@@ -132,8 +230,12 @@ public:									/*{{{*/
 	    \param Cache the packages are in
 	    \param pattern name of the task
 	    \param helper responsible for error and message handling */
-	static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper);
-	static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string const &pattern) {
+	static PackageContainer FromTask(pkgCacheFile &Cache, std::string const &pattern, CacheSetHelper &helper) {
+		PackageContainer cont(TASK);
+		PackageContainerInterface::FromTask(&cont, Cache, pattern, helper);
+		return cont;
+	}
+	static PackageContainer FromTask(pkgCacheFile &Cache, std::string const &pattern) {
 		CacheSetHelper helper;
 		return FromTask(Cache, pattern, helper);
 	}
@@ -146,32 +248,43 @@ public:									/*{{{*/
 	    \param Cache the packages are in
 	    \param pattern regular expression for package names
 	    \param helper responsible for error and message handling */
-	static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper);
-	static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string const &pattern) {
+	static PackageContainer FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) {
+		PackageContainer cont(REGEX);
+		PackageContainerInterface::FromRegEx(&cont, Cache, pattern, helper);
+		return cont;
+	}
+
+	static PackageContainer FromRegEx(pkgCacheFile &Cache, std::string const &pattern) {
 		CacheSetHelper helper;
 		return FromRegEx(Cache, pattern, helper);
 	}
 
-	/** \brief returns all packages specified by a string
+	/** \brief returns a package specified by a string
 
-	    \param Cache the packages are in
-	    \param string String the package name(s) should be extracted from
+	    \param Cache the package is in
+	    \param pattern String the package name should be extracted from
 	    \param helper responsible for error and message handling */
-	static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper);
-	static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string) {
+	static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &pattern, CacheSetHelper &helper) {
+		return PackageContainerInterface::FromName(Cache, pattern, helper);
+	}
+	static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &pattern) {
 		CacheSetHelper helper;
-		return FromString(Cache, string, helper);
+		return PackageContainerInterface::FromName(Cache, pattern, helper);
 	}
 
-	/** \brief returns a package specified by a string
+	/** \brief returns all packages specified by a string
 
-	    \param Cache the package is in
-	    \param string String the package name should be extracted from
+	    \param Cache the packages are in
+	    \param pattern String the package name(s) should be extracted from
 	    \param helper responsible for error and message handling */
-	static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper);
-	static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string) {
+	static PackageContainer FromString(pkgCacheFile &Cache, std::string const &pattern, CacheSetHelper &helper) {
+		PackageContainer cont;
+		PackageContainerInterface::FromString(&cont, Cache, pattern, helper);
+		return cont;
+	}
+	static PackageContainer FromString(pkgCacheFile &Cache, std::string const &pattern) {
 		CacheSetHelper helper;
-		return FromName(Cache, string, helper);
+		return FromString(Cache, pattern, helper);
 	}
 
 	/** \brief returns all packages specified on the commandline
@@ -181,20 +294,16 @@ public:									/*{{{*/
 	    \param Cache the packages are in
 	    \param cmdline Command line the package names should be extracted from
 	    \param helper responsible for error and message handling */
-	static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper);
-	static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) {
+	static PackageContainer FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper) {
+		PackageContainer cont;
+		PackageContainerInterface::FromCommandLine(&cont, Cache, cmdline, helper);
+		return cont;
+	}
+	static PackageContainer FromCommandLine(pkgCacheFile &Cache, const char **cmdline) {
 		CacheSetHelper helper;
 		return FromCommandLine(Cache, cmdline, helper);
 	}
 
-	struct Modifier {
-		enum Position { NONE, PREFIX, POSTFIX };
-		unsigned short ID;
-		const char * const Alias;
-		Position Pos;
-		Modifier (unsigned short const &id, const char * const alias, Position const &pos) : ID(id), Alias(alias), Pos(pos) {};
-	};
-
 	/** \brief group packages by a action modifiers
 
 	    At some point it is needed to get from the same commandline
@@ -206,78 +315,93 @@ public:									/*{{{*/
 	    \param mods list of modifiers the method should accept
 	    \param fallback the default modifier group for a package
 	    \param helper responsible for error and message handling */
-	static std::map<unsigned short, PackageSet> GroupedFromCommandLine(
-		pkgCacheFile &Cache, const char **cmdline,
-		std::list<PackageSet::Modifier> const &mods,
-		unsigned short const &fallback, CacheSetHelper &helper);
-	static std::map<unsigned short, PackageSet> GroupedFromCommandLine(
-		pkgCacheFile &Cache, const char **cmdline,
-		std::list<PackageSet::Modifier> const &mods,
-		unsigned short const &fallback) {
+	static std::map<unsigned short, PackageContainer> GroupedFromCommandLine(
+										 pkgCacheFile &Cache,
+										 const char **cmdline,
+										 std::list<Modifier> const &mods,
+										 unsigned short const &fallback,
+										 CacheSetHelper &helper) {
+		std::map<unsigned short, PackageContainer> pkgsets;
+		for (const char **I = cmdline; *I != 0; ++I) {
+			unsigned short modID = fallback;
+			PackageContainer pkgset;
+			PackageContainerInterface::FromModifierCommandLine(modID, &pkgset, Cache, *I, mods, helper);
+			pkgsets[modID].insert(pkgset);
+		}
+		return pkgsets;
+	}
+	static std::map<unsigned short, PackageContainer> GroupedFromCommandLine(
+										 pkgCacheFile &Cache,
+										 const char **cmdline,
+										 std::list<Modifier> const &mods,
+										 unsigned short const &fallback) {
 		CacheSetHelper helper;
 		return GroupedFromCommandLine(Cache, cmdline,
 				mods, fallback, helper);
 	}
-
-	enum Constructor { UNKNOWN, REGEX, TASK };
-	Constructor getConstructor() const { return ConstructedBy; };
-
-	PackageSet() : ConstructedBy(UNKNOWN) {};
-	PackageSet(Constructor const &by) : ConstructedBy(by) {};
 									/*}}}*/
 private:								/*{{{*/
 	Constructor ConstructedBy;
 									/*}}}*/
 };									/*}}}*/
-class VersionSet : public std::set<pkgCache::VerIterator> {		/*{{{*/
-/** \class APT::VersionSet
 
-    Simple wrapper around a std::set to provide a similar interface to
-    a set of versions as to the complete set of all versions in the
-    pkgCache. */
-public:									/*{{{*/
+template<> template<class Cont> void PackageContainer<std::list<pkgCache::PkgIterator> >::insert(PackageContainer<Cont> const &pkgcont) {
+	for (typename PackageContainer<Cont>::const_iterator p = pkgcont.begin(); p != pkgcont.end(); ++p)
+		_cont.push_back(*p);
+};
+// these two are 'inline' as otherwise the linker has problems with seeing these untemplated
+// specializations again and again - but we need to see them, so that library users can use them
+template<> inline bool PackageContainer<std::list<pkgCache::PkgIterator> >::insert(pkgCache::PkgIterator const &P) {
+	if (P.end() == true)
+		return false;
+	_cont.push_back(P);
+	return true;
+};
+template<> inline void PackageContainer<std::list<pkgCache::PkgIterator> >::insert(const_iterator begin, const_iterator end) {
+	for (const_iterator p = begin; p != end; ++p)
+		_cont.push_back(*p);
+};
+typedef PackageContainer<std::set<pkgCache::PkgIterator> > PackageSet;
+typedef PackageContainer<std::list<pkgCache::PkgIterator> > PackageList;
+
+class VersionContainerInterface {					/*{{{*/
+/** \class APT::VersionContainerInterface
+
+    Same as APT::PackageContainerInterface, just for Versions */
+public:
 	/** \brief smell like a pkgCache::VerIterator */
-	class const_iterator : public std::set<pkgCache::VerIterator>::const_iterator {/*{{{*/
+	class const_iterator {						/*{{{*/
 	public:
-		const_iterator(std::set<pkgCache::VerIterator>::const_iterator x) :
-			 std::set<pkgCache::VerIterator>::const_iterator(x) {}
-
-		operator pkgCache::VerIterator(void) { return **this; }
-
-		inline pkgCache *Cache() const { return (**this).Cache(); };
-		inline unsigned long Index() const {return (**this).Index();};
+		virtual pkgCache::VerIterator getVer() const = 0;
+		operator pkgCache::VerIterator(void) { return getVer(); }
+
+		inline pkgCache *Cache() const { return getVer().Cache(); };
+		inline unsigned long Index() const {return getVer().Index();};
+		inline int CompareVer(const pkgCache::VerIterator &B) const { return getVer().CompareVer(B); };
+		inline const char *VerStr() const { return getVer().VerStr(); };
+		inline const char *Section() const { return getVer().Section(); };
+		inline const char *Arch() const { return getVer().Arch(); };
+		inline pkgCache::PkgIterator ParentPkg() const { return getVer().ParentPkg(); };
+		inline pkgCache::DescIterator DescriptionList() const { return getVer().DescriptionList(); };
+		inline pkgCache::DescIterator TranslatedDescription() const { return getVer().TranslatedDescription(); };
+		inline pkgCache::DepIterator DependsList() const { return getVer().DependsList(); };
+		inline pkgCache::PrvIterator ProvidesList() const { return getVer().ProvidesList(); };
+		inline pkgCache::VerFileIterator FileList() const { return getVer().FileList(); };
+		inline bool Downloadable() const { return getVer().Downloadable(); };
+		inline const char *PriorityType() const { return getVer().PriorityType(); };
+		inline std::string RelStr() const { return getVer().RelStr(); };
+		inline bool Automatic() const { return getVer().Automatic(); };
+		inline pkgCache::VerFileIterator NewestFile() const { return getVer().NewestFile(); };
 		// we have only valid iterators here
 		inline bool end() const { return false; };
 
-		inline pkgCache::Version const * operator->() const {
-			return &***this;
-		};
-
-		inline int CompareVer(const pkgCache::VerIterator &B) const { return (**this).CompareVer(B); };
-		inline const char *VerStr() const { return (**this).VerStr(); };
-		inline const char *Section() const { return (**this).Section(); };
-		inline const char *Arch() const { return (**this).Arch(); };
-		__deprecated inline const char *Arch(bool const pseudo) const { return (**this).Arch(); };
-		inline pkgCache::PkgIterator ParentPkg() const { return (**this).ParentPkg(); };
-		inline pkgCache::DescIterator DescriptionList() const { return (**this).DescriptionList(); };
-		inline pkgCache::DescIterator TranslatedDescription() const { return (**this).TranslatedDescription(); };
-		inline pkgCache::DepIterator DependsList() const { return (**this).DependsList(); };
-		inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); };
-		inline pkgCache::VerFileIterator FileList() const { return (**this).FileList(); };
-		inline bool Downloadable() const { return (**this).Downloadable(); };
-		inline const char *PriorityType() const { return (**this).PriorityType(); };
-		inline string RelStr() const { return (**this).RelStr(); };
-		inline bool Automatic() const { return (**this).Automatic(); };
-		__deprecated inline bool Pseudo() const { return false; };
-		inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); };
+		inline pkgCache::Version const * operator->() const { return &*getVer(); };
 	};
 									/*}}}*/
-	// 103. set::iterator is required to be modifiable, but this allows modification of keys
-	typedef APT::VersionSet::const_iterator iterator;
 
-	using std::set<pkgCache::VerIterator>::insert;
-	inline void insert(pkgCache::VerIterator const &V) { if (V.end() == false) std::set<pkgCache::VerIterator>::insert(V); };
-	inline void insert(VersionSet const &verset) { insert(verset.begin(), verset.end()); };
+	virtual bool insert(pkgCache::VerIterator const &V) = 0;
+	virtual bool empty() const = 0;
+	virtual void clear() = 0;
 
 	/** \brief specifies which version(s) will be returned if non is given */
 	enum Version {
@@ -297,6 +421,120 @@ public:									/*{{{*/
 		NEWEST
 	};
 
+	struct Modifier {
+		enum Position { NONE, PREFIX, POSTFIX };
+		unsigned short ID;
+		const char * const Alias;
+		Position Pos;
+		Version SelectVersion;
+		Modifier (unsigned short const &id, const char * const alias, Position const &pos,
+			  Version const &select) : ID(id), Alias(alias), Pos(pos),
+			 SelectVersion(select) {};
+	};
+
+	static bool FromCommandLine(VersionContainerInterface * const vci, pkgCacheFile &Cache,
+				    const char **cmdline, Version const &fallback,
+				    CacheSetHelper &helper);
+
+	static bool FromString(VersionContainerInterface * const vci, pkgCacheFile &Cache,
+			       std::string pkg, Version const &fallback, CacheSetHelper &helper,
+			       bool const onlyFromName = false);
+
+	static bool FromPackage(VersionContainerInterface * const vci, pkgCacheFile &Cache,
+				pkgCache::PkgIterator const &P, Version const &fallback,
+				CacheSetHelper &helper);
+
+	static bool FromModifierCommandLine(unsigned short &modID,
+					    VersionContainerInterface * const vci,
+					    pkgCacheFile &Cache, const char * cmdline,
+					    std::list<Modifier> const &mods,
+					    CacheSetHelper &helper);
+
+
+	static bool FromDependency(VersionContainerInterface * const vci,
+				   pkgCacheFile &Cache,
+				   pkgCache::DepIterator const &D,
+				   Version const &selector,
+				   CacheSetHelper &helper);
+
+protected:								/*{{{*/
+
+	/** \brief returns the candidate version of the package
+
+	    \param Cache to be used to query for information
+	    \param Pkg we want the candidate version from this package */
+	static pkgCache::VerIterator getCandidateVer(pkgCacheFile &Cache,
+		pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper);
+
+	/** \brief returns the installed version of the package
+
+	    \param Cache to be used to query for information
+	    \param Pkg we want the installed version from this package */
+	static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache,
+		pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper);
+									/*}}}*/
+};
+									/*}}}*/
+template<class Container> class VersionContainer : public VersionContainerInterface {/*{{{*/
+/** \class APT::VersionContainer
+
+    Simple wrapper around a container class like std::set to provide a similar
+    interface to a set of versions as to the complete set of all versions in the
+    pkgCache. */
+	Container _cont;
+public:									/*{{{*/
+	/** \brief smell like a pkgCache::VerIterator */
+	class const_iterator : public VersionContainerInterface::const_iterator,
+			       public std::iterator<std::forward_iterator_tag, typename Container::const_iterator> {/*{{{*/
+		typename Container::const_iterator _iter;
+	public:
+		const_iterator(typename Container::const_iterator i) : _iter(i) {}
+		pkgCache::VerIterator getVer(void) const { return *_iter; }
+		inline pkgCache::VerIterator operator*(void) const { return *_iter; };
+		operator typename Container::const_iterator(void) const { return _iter; }
+		inline const_iterator& operator++() { ++_iter; return *this; }
+		inline const_iterator operator++(int) { const_iterator tmp(*this); operator++(); return tmp; }
+		inline bool operator!=(const_iterator const &i) const { return _iter != i._iter; };
+		inline bool operator==(const_iterator const &i) const { return _iter == i._iter; };
+		friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, *i); }
+	};
+	class iterator : public VersionContainerInterface::const_iterator,
+			 public std::iterator<std::forward_iterator_tag, typename Container::iterator> {
+		typename Container::iterator _iter;
+	public:
+		iterator(typename Container::iterator i) : _iter(i) {}
+		pkgCache::VerIterator getVer(void) const { return *_iter; }
+		inline pkgCache::VerIterator operator*(void) const { return *_iter; };
+		operator typename Container::iterator(void) const { return _iter; }
+		operator typename VersionContainer<Container>::const_iterator() { return VersionContainer<Container>::const_iterator(_iter); }
+		inline iterator& operator++() { ++_iter; return *this; }
+		inline iterator operator++(int) { iterator tmp(*this); operator++(); return tmp; }
+		inline bool operator!=(iterator const &i) const { return _iter != i._iter; };
+		inline bool operator==(iterator const &i) const { return _iter == i._iter; };
+		inline iterator& operator=(iterator const &i) { _iter = i._iter; return *this; };
+		inline iterator& operator=(typename Container::iterator const &i) { _iter = i; return *this; };
+		friend std::ostream& operator<<(std::ostream& out, iterator i) { return operator<<(out, *i); }
+	};
+									/*}}}*/
+
+	bool insert(pkgCache::VerIterator const &V) { if (V.end() == true) return false; _cont.insert(V); return true; };
+	template<class Cont> void insert(VersionContainer<Cont> const &vercont) { _cont.insert((typename Cont::const_iterator)vercont.begin(), (typename Cont::const_iterator)vercont.end()); };
+	void insert(const_iterator begin, const_iterator end) { _cont.insert(begin, end); };
+	bool empty() const { return _cont.empty(); };
+	void clear() { return _cont.clear(); };
+	//FIXME: on ABI break, replace the first with the second without bool
+	void erase(iterator position) { _cont.erase((typename Container::iterator)position); };
+	iterator& erase(iterator &position, bool) { return position = _cont.erase((typename Container::iterator)position); };
+	size_t erase(const pkgCache::VerIterator x) { return _cont.erase(x); };
+	void erase(iterator first, iterator last) { _cont.erase(first, last); };
+	size_t size() const { return _cont.size(); };
+
+	const_iterator begin() const { return const_iterator(_cont.begin()); };
+	const_iterator end() const { return const_iterator(_cont.end()); };
+	iterator begin() { return iterator(_cont.begin()); };
+	iterator end() { return iterator(_cont.end()); };
+	const_iterator find(pkgCache::VerIterator const &V) const { return const_iterator(_cont.find(V)); };
+
 	/** \brief returns all versions specified on the commandline
 
 	    Get all versions from the commandline, uses given default version if
@@ -304,26 +542,34 @@ public:									/*{{{*/
 	    \param Cache the packages and versions are in
 	    \param cmdline Command line the versions should be extracted from
 	    \param helper responsible for error and message handling */
-	static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline,
-			APT::VersionSet::Version const &fallback, CacheSetHelper &helper);
-	static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline,
-			APT::VersionSet::Version const &fallback) {
+	static VersionContainer FromCommandLine(pkgCacheFile &Cache, const char **cmdline,
+			Version const &fallback, CacheSetHelper &helper) {
+		VersionContainer vercon;
+		VersionContainerInterface::FromCommandLine(&vercon, Cache, cmdline, fallback, helper);
+		return vercon;
+	}
+	static VersionContainer FromCommandLine(pkgCacheFile &Cache, const char **cmdline,
+			Version const &fallback) {
 		CacheSetHelper helper;
 		return FromCommandLine(Cache, cmdline, fallback, helper);
 	}
-	static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) {
+	static VersionContainer FromCommandLine(pkgCacheFile &Cache, const char **cmdline) {
 		return FromCommandLine(Cache, cmdline, CANDINST);
 	}
 
-	static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg,
-			APT::VersionSet::Version const &fallback, CacheSetHelper &helper,
-			bool const &onlyFromName = false);
-	static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg,
-			APT::VersionSet::Version const &fallback) {
+	static VersionContainer FromString(pkgCacheFile &Cache, std::string const &pkg,
+			Version const &fallback, CacheSetHelper &helper,
+			bool const onlyFromName = false) {
+		VersionContainer vercon;
+		VersionContainerInterface::FromString(&vercon, Cache, pkg, fallback, helper);
+		return vercon;
+	}
+	static VersionContainer FromString(pkgCacheFile &Cache, std::string pkg,
+			Version const &fallback) {
 		CacheSetHelper helper;
 		return FromString(Cache, pkg, fallback, helper);
 	}
-	static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg) {
+	static VersionContainer FromString(pkgCacheFile &Cache, std::string pkg) {
 		return FromString(Cache, pkg, CANDINST);
 	}
 
@@ -333,57 +579,80 @@ public:									/*{{{*/
 	    \param P the package in question
 	    \param fallback the version(s) you want to get
 	    \param helper the helper used for display and error handling */
-	static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P,
-		VersionSet::Version const &fallback, CacheSetHelper &helper);
-	static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P,
-			APT::VersionSet::Version const &fallback) {
+	static VersionContainer FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P,
+		Version const &fallback, CacheSetHelper &helper) {
+		VersionContainer vercon;
+		VersionContainerInterface::FromPackage(&vercon, Cache, P, fallback, helper);
+		return vercon;
+	}
+	static VersionContainer FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P,
+					    Version const &fallback) {
 		CacheSetHelper helper;
 		return FromPackage(Cache, P, fallback, helper);
 	}
-	static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P) {
-		return FromPackage(Cache, P, CANDINST);
+	static VersionContainer FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P) {
+		return FromPackage(Cache, P, CANDIDATE);
 	}
 
-	struct Modifier {
-		enum Position { NONE, PREFIX, POSTFIX };
-		unsigned short ID;
-		const char * const Alias;
-		Position Pos;
-		VersionSet::Version SelectVersion;
-		Modifier (unsigned short const &id, const char * const alias, Position const &pos,
-			  VersionSet::Version const &select) : ID(id), Alias(alias), Pos(pos),
-			 SelectVersion(select) {};
-	};
+	static std::map<unsigned short, VersionContainer> GroupedFromCommandLine(
+										 pkgCacheFile &Cache,
+										 const char **cmdline,
+										 std::list<Modifier> const &mods,
+										 unsigned short const fallback,
+										 CacheSetHelper &helper) {
+		std::map<unsigned short, VersionContainer> versets;
+		for (const char **I = cmdline; *I != 0; ++I) {
+			unsigned short modID = fallback;
+			VersionContainer verset;
+			VersionContainerInterface::FromModifierCommandLine(modID, &verset, Cache, *I, mods, helper);
+			versets[modID].insert(verset);
+		}
+		return versets;
 
-	static std::map<unsigned short, VersionSet> GroupedFromCommandLine(
-		pkgCacheFile &Cache, const char **cmdline,
-		std::list<VersionSet::Modifier> const &mods,
-		unsigned short const &fallback, CacheSetHelper &helper);
-	static std::map<unsigned short, VersionSet> GroupedFromCommandLine(
+	}
+	static std::map<unsigned short, VersionContainer> GroupedFromCommandLine(
 		pkgCacheFile &Cache, const char **cmdline,
-		std::list<VersionSet::Modifier> const &mods,
-		unsigned short const &fallback) {
+		std::list<Modifier> const &mods,
+		unsigned short const fallback) {
 		CacheSetHelper helper;
 		return GroupedFromCommandLine(Cache, cmdline,
 				mods, fallback, helper);
 	}
-									/*}}}*/
-protected:								/*{{{*/
 
-	/** \brief returns the candidate version of the package
-
-	    \param Cache to be used to query for information
-	    \param Pkg we want the candidate version from this package */
-	static pkgCache::VerIterator getCandidateVer(pkgCacheFile &Cache,
-		pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper);
-
-	/** \brief returns the installed version of the package
-
-	    \param Cache to be used to query for information
-	    \param Pkg we want the installed version from this package */
-	static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache,
-		pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper);
+	static VersionContainer FromDependency(pkgCacheFile &Cache, pkgCache::DepIterator const &D,
+					       Version const &selector, CacheSetHelper &helper) {
+		VersionContainer vercon;
+		VersionContainerInterface::FromDependency(&vercon, Cache, D, selector, helper);
+		return vercon;
+	}
+	static VersionContainer FromDependency(pkgCacheFile &Cache, pkgCache::DepIterator const &D,
+					       Version const &selector) {
+		CacheSetHelper helper;
+		return FromPackage(Cache, D, selector, helper);
+	}
+	static VersionContainer FromDependency(pkgCacheFile &Cache, pkgCache::DepIterator const &D) {
+		return FromPackage(Cache, D, CANDIDATE);
+	}
 									/*}}}*/
 };									/*}}}*/
+
+template<> template<class Cont> void VersionContainer<std::list<pkgCache::VerIterator> >::insert(VersionContainer<Cont> const &vercont) {
+	for (typename VersionContainer<Cont>::const_iterator v = vercont.begin(); v != vercont.end(); ++v)
+		_cont.push_back(*v);
+};
+// these two are 'inline' as otherwise the linker has problems with seeing these untemplated
+// specializations again and again - but we need to see them, so that library users can use them
+template<> inline bool VersionContainer<std::list<pkgCache::VerIterator> >::insert(pkgCache::VerIterator const &V) {
+	if (V.end() == true)
+		return false;
+	_cont.push_back(V);
+	return true;
+};
+template<> inline void VersionContainer<std::list<pkgCache::VerIterator> >::insert(const_iterator begin, const_iterator end) {
+	for (const_iterator v = begin; v != end; ++v)
+		_cont.push_back(*v);
+};
+typedef VersionContainer<std::set<pkgCache::VerIterator> > VersionSet;
+typedef VersionContainer<std::list<pkgCache::VerIterator> > VersionList;
 }
 #endif
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index b8acf0cbe..50c204371 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -1,5 +1,6 @@
 /*
  */
+#include<config.h>
 
 #include<apt-pkg/init.h>
 #include<apt-pkg/error.h>
@@ -7,11 +8,11 @@
 #include<apt-pkg/strutl.h>
 #include<apt-pkg/cdrom.h>
 #include<apt-pkg/aptconfiguration.h>
+#include<apt-pkg/configuration.h>
+#include<apt-pkg/fileutl.h>
 
 #include<sstream>
 #include<fstream>
-#include<config.h>
-#include<apti18n.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <dirent.h>
@@ -22,6 +23,8 @@
 
 #include "indexcopy.h"
 
+#include<apti18n.h>
+
 using namespace std;
 
 // FindPackages - Find the package files on the CDROM			/*{{{*/
@@ -55,66 +58,91 @@ bool pkgCdrom::FindPackages(string CD,
       return _error->Errno("chdir","Unable to change to %s",CD.c_str());
 
    // Look for a .disk subdirectory
-   struct stat Buf;
-   if (stat(".disk",&Buf) == 0)
+   if (DirectoryExists(".disk") == true)
    {
       if (InfoDir.empty() == true)
 	 InfoDir = CD + ".disk/";
    }
 
    // Don't look into directories that have been marked to ingore.
-   if (stat(".aptignr",&Buf) == 0)
+   if (RealFileExists(".aptignr") == true)
       return true;
 
-
    /* Check _first_ for a signature file as apt-cdrom assumes that all files
       under a Packages/Source file are in control of that file and stops 
       the scanning
    */
-   if (stat("Release.gpg",&Buf) == 0)
+   if (RealFileExists("Release.gpg") == true || RealFileExists("InRelease") == true)
    {
       SigList.push_back(CD);
    }
+
    /* Aha! We found some package files. We assume that everything under 
       this dir is controlled by those package files so we don't look down
       anymore */
-   if (stat("Packages",&Buf) == 0 || stat("Packages.gz",&Buf) == 0)
+   std::vector<APT::Configuration::Compressor> const compressor = APT::Configuration::getCompressors();
+   for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
+	c != compressor.end(); ++c)
    {
+      if (RealFileExists(std::string("Packages").append(c->Extension).c_str()) == false)
+	 continue;
+
+      if (_config->FindB("Debug::aptcdrom",false) == true)
+	 std::clog << "Found Packages in " << CD << std::endl;
       List.push_back(CD);
-      
+
       // Continue down if thorough is given
       if (_config->FindB("APT::CDROM::Thorough",false) == false)
 	 return true;
+      break;
    }
-   if (stat("Sources.gz",&Buf) == 0 || stat("Sources",&Buf) == 0)
+   for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
+	c != compressor.end(); ++c)
    {
+      if (RealFileExists(std::string("Sources").append(c->Extension).c_str()) == false)
+	 continue;
+
+      if (_config->FindB("Debug::aptcdrom",false) == true)
+	 std::clog << "Found Sources in " << CD << std::endl;
       SList.push_back(CD);
-      
+
       // Continue down if thorough is given
       if (_config->FindB("APT::CDROM::Thorough",false) == false)
 	 return true;
+      break;
    }
 
-   // see if we find translatin indexes
-   if (stat("i18n",&Buf) == 0)
+   // see if we find translation indices
+   if (DirectoryExists("i18n") == true)
    {
       D = opendir("i18n");
       for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
       {
-	 if(strstr(Dir->d_name,"Translation") != NULL) 
+	 if(strncmp(Dir->d_name, "Translation-", strlen("Translation-")) != 0)
+	    continue;
+	 string file = Dir->d_name;
+	 for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
+	      c != compressor.end(); ++c)
 	 {
-	    if (_config->FindB("Debug::aptcdrom",false) == true)
-	       std::clog << "found translations: " << Dir->d_name << "\n";
-	    string file = Dir->d_name;
-	    if(file.substr(file.size()-3,file.size()) == ".gz")
-	       file = file.substr(0,file.size()-3);
-	    TransList.push_back(CD+"i18n/"+ file);
+	    string fileext = flExtension(file);
+	    if (file == fileext)
+	       fileext.clear();
+	    else if (fileext.empty() == false)
+	       fileext = "." + fileext;
+
+	    if (c->Extension == fileext)
+	    {
+	       if (_config->FindB("Debug::aptcdrom",false) == true)
+		  std::clog << "Found translation " << Dir->d_name << " in " << CD << "i18n/" << std::endl;
+	       file.erase(file.size() - fileext.size());
+	       TransList.push_back(CD + "i18n/" + file);
+	       break;
+	    }
 	 }
       }
       closedir(D);
    }
 
-   
    D = opendir(".");
    if (D == 0)
       return _error->Errno("opendir","Unable to read %s",CD.c_str());
@@ -249,30 +277,43 @@ bool pkgCdrom::DropBinaryArch(vector<string> &List)
 /* Here we go and stat every file that we found and strip dup inodes. */
 bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
 {
+   bool couldFindAllFiles = true;
    // Get a list of all the inodes
    ino_t *Inodes = new ino_t[List.size()];
-   for (unsigned int I = 0; I != List.size(); I++)
+   for (unsigned int I = 0; I != List.size(); ++I)
    {
       struct stat Buf;
-      if (stat((List[I] + Name).c_str(),&Buf) != 0 &&
-	  stat((List[I] + Name + ".gz").c_str(),&Buf) != 0)
-	 _error->Errno("stat","Failed to stat %s%s",List[I].c_str(),
-		       Name);
-      Inodes[I] = Buf.st_ino;
-   }
-   
-   if (_error->PendingError() == true) {
-      delete[] Inodes;
-      return false;
+      bool found = false;
+
+      std::vector<APT::Configuration::Compressor> const compressor = APT::Configuration::getCompressors();
+      for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
+	   c != compressor.end(); ++c)
+      {
+	 std::string filename = std::string(List[I]).append(Name).append(c->Extension);
+         if (stat(filename.c_str(), &Buf) != 0)
+	    continue;
+	 Inodes[I] = Buf.st_ino;
+	 found = true;
+	 break;
+      }
+
+      if (found == false)
+      {
+	 _error->Errno("stat","Failed to stat %s%s",List[I].c_str(), Name);
+	 couldFindAllFiles = false;
+	 Inodes[I] = 0;
+      }
    }
-   
+
    // Look for dups
    for (unsigned int I = 0; I != List.size(); I++)
    {
+      if (Inodes[I] == 0)
+	 continue;
       for (unsigned int J = I+1; J < List.size(); J++)
       {
 	 // No match
-	 if (Inodes[J] != Inodes[I])
+	 if (Inodes[J] == 0 || Inodes[J] != Inodes[I])
 	    continue;
 	 
 	 // We score the two paths.. and erase one
@@ -298,7 +339,7 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
 	 List.erase(List.begin()+I);
    }
    
-   return true;
+   return couldFindAllFiles;
 }
 									/*}}}*/
 // ReduceSourceList - Takes the path list and reduces it		/*{{{*/
@@ -389,7 +430,8 @@ bool pkgCdrom::WriteDatabase(Configuration &Cnf)
 
    Out.close();
    
-   link(DFile.c_str(),string(DFile + '~').c_str());
+   if (FileExists(DFile) == true && link(DFile.c_str(),string(DFile + '~').c_str()) != 0)
+      return _error->Errno("link", "Failed to link %s to %s~", DFile.c_str(), DFile.c_str());
    if (rename(NewFile.c_str(),DFile.c_str()) != 0)
       return _error->Errno("rename","Failed to rename %s.new to %s",
 			   DFile.c_str(),DFile.c_str());
@@ -656,7 +698,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log)					/*{{{*/
       return false;
    }
 
-   chdir(StartDir.c_str());
+   if (chdir(StartDir.c_str()) != 0)
+      return _error->Errno("chdir","Unable to change to %s", StartDir.c_str());
 
    if (_config->FindB("Debug::aptcdrom",false) == true)
    {
@@ -677,7 +720,13 @@ bool pkgCdrom::Add(pkgCdromStatus *log)					/*{{{*/
    DropBinaryArch(List);
    DropRepeats(List,"Packages");
    DropRepeats(SourceList,"Sources");
+   // FIXME: We ignore stat() errors here as we usually have only one of those in use
+   // This has little potencial to drop 'valid' stat() errors as we know that one of these
+   // files need to exist, but it would be better if we would check it here
+   _error->PushToStack();
    DropRepeats(SigList,"Release.gpg");
+   DropRepeats(SigList,"InRelease");
+   _error->RevertToStack();
    DropRepeats(TransList,"");
    if(log != NULL) {
       msg.str("");
@@ -874,9 +923,7 @@ pkgUdevCdromDevices::Dlopen()                     		        /*{{{*/
    libudev_handle = h;
    udev_new = (udev* (*)(void)) dlsym(h, "udev_new");
    udev_enumerate_add_match_property = (int (*)(udev_enumerate*, const char*, const char*))dlsym(h, "udev_enumerate_add_match_property");
-#if 0 // FIXME: uncomment on next ABI break
    udev_enumerate_add_match_sysattr = (int (*)(udev_enumerate*, const char*, const char*))dlsym(h, "udev_enumerate_add_match_sysattr");
-#endif
    udev_enumerate_scan_devices = (int (*)(udev_enumerate*))dlsym(h, "udev_enumerate_scan_devices");
    udev_enumerate_get_list_entry = (udev_list_entry* (*)(udev_enumerate*))dlsym(h, "udev_enumerate_get_list_entry");
    udev_device_new_from_syspath = (udev_device* (*)(udev*, const char*))dlsym(h, "udev_device_new_from_syspath");
@@ -890,10 +937,8 @@ pkgUdevCdromDevices::Dlopen()                     		        /*{{{*/
    return true;
 }
 									/*}}}*/
-
                                                                         /*{{{*/
-// compatiblity only with the old API/ABI, can be removed on the next
-// ABI break
+// convenience interface, this will just call ScanForRemovable
 vector<CdromDevice>
 pkgUdevCdromDevices::Scan()
 { 
@@ -918,10 +963,6 @@ pkgUdevCdromDevices::ScanForRemovable(bool CdromOnly)
    if (CdromOnly)
       udev_enumerate_add_match_property(enumerate, "ID_CDROM", "1");
    else {
-#if 1 // FIXME: remove the next two lines on the next ABI break
-      int (*udev_enumerate_add_match_sysattr)(struct udev_enumerate *udev_enumerate, const char *property, const char *value);
-      udev_enumerate_add_match_sysattr = (int (*)(udev_enumerate*, const char*, const char*))dlsym(libudev_handle, "udev_enumerate_add_match_sysattr");
-#endif
       udev_enumerate_add_match_sysattr(enumerate, "removable", "1");
    }
 
diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index e83c38582..cedfccff7 100644
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -1,12 +1,16 @@
 #ifndef PKGLIB_CDROM_H
 #define PKGLIB_CDROM_H
 
-#include<apt-pkg/init.h>
 #include<string>
 #include<vector>
 
-
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/init.h>
 using namespace std;
+#endif
+
+class Configuration;
+class OpProgress;
 
 class pkgCdromStatus							/*{{{*/
 {
@@ -20,12 +24,12 @@ class pkgCdromStatus							/*{{{*/
    // total steps
    virtual void SetTotal(int total) { totalSteps = total; };
    // update steps, will be called regularly as a "pulse"
-   virtual void Update(string text="", int current=0) = 0;
+   virtual void Update(std::string text="", int current=0) = 0;
    
    // ask for cdrom insert
    virtual bool ChangeCdrom() = 0;
    // ask for cdrom name
-   virtual bool AskCdromName(string &Name) = 0;
+   virtual bool AskCdromName(std::string &Name) = 0;
    // Progress indicator for the Index rewriter
    virtual OpProgress* GetOpProgress() {return NULL; };
 };
@@ -47,22 +51,22 @@ class pkgCdrom								/*{{{*/
    };
 
 
-   bool FindPackages(string CD,
-		     vector<string> &List,
-		     vector<string> &SList, 
-		     vector<string> &SigList,
-		     vector<string> &TransList,
-		     string &InfoDir, pkgCdromStatus *log,
+   bool FindPackages(std::string CD,
+		     std::vector<std::string> &List,
+		     std::vector<std::string> &SList, 
+		     std::vector<std::string> &SigList,
+		     std::vector<std::string> &TransList,
+		     std::string &InfoDir, pkgCdromStatus *log,
 		     unsigned int Depth = 0);
-   bool DropBinaryArch(vector<string> &List);
-   bool DropRepeats(vector<string> &List,const char *Name);
-   void ReduceSourcelist(string CD,vector<string> &List);
+   bool DropBinaryArch(std::vector<std::string> &List);
+   bool DropRepeats(std::vector<std::string> &List,const char *Name);
+   void ReduceSourcelist(std::string CD,std::vector<std::string> &List);
    bool WriteDatabase(Configuration &Cnf);
-   bool WriteSourceList(string Name,vector<string> &List,bool Source);
-   int Score(string Path);
+   bool WriteSourceList(std::string Name,std::vector<std::string> &List,bool Source);
+   int Score(std::string Path);
 
  public:
-   bool Ident(string &ident, pkgCdromStatus *log);
+   bool Ident(std::string &ident, pkgCdromStatus *log);
    bool Add(pkgCdromStatus *log);
 };
 									/*}}}*/
@@ -71,9 +75,9 @@ class pkgCdrom								/*{{{*/
 // class that uses libudev to find cdrom/removable devices dynamically
 struct CdromDevice							/*{{{*/
 {
-   string DeviceName;
+   std::string DeviceName;
    bool Mounted;
-   string MountPath;
+   std::string MountPath;
 };
 									/*}}}*/
 class pkgUdevCdromDevices						/*{{{*/
@@ -92,9 +96,7 @@ class pkgUdevCdromDevices						/*{{{*/
    struct udev_enumerate *(*udev_enumerate_new) (struct udev *udev);
    struct udev_list_entry *(*udev_list_entry_get_next)(struct udev_list_entry *list_entry);
    const char* (*udev_device_get_property_value)(struct udev_device *udev_device, const char *key);
-#if 0 // FIXME: uncomment on next ABI break
    int (*udev_enumerate_add_match_sysattr)(struct udev_enumerate *udev_enumerate, const char *property, const char *value);
-#endif 
    // end libudev dlopen
    
  public:
@@ -104,11 +106,11 @@ class pkgUdevCdromDevices						/*{{{*/
    // try to open 
    bool Dlopen();
 
-   // this is the new interface
-   vector<CdromDevice> ScanForRemovable(bool CdromOnly);
-   // FIXME: compat with the old interface/API/ABI only
-   vector<CdromDevice> Scan();
+   // convenience interface, this will just call ScanForRemovable
+   // with "APT::cdrom::CdromOnly"
+   std::vector<CdromDevice> Scan();
 
+   std::vector<CdromDevice> ScanForRemovable(bool CdromOnly);
 };
 									/*}}}*/
 
diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc
index 9850b93b4..9c167eaa5 100644
--- a/apt-pkg/clean.cc
+++ b/apt-pkg/clean.cc
@@ -8,23 +8,26 @@
    ##################################################################### */
 									/*}}}*/
 // Includes								/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/clean.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/aptconfiguration.h>
-
-#include <apti18n.h>    
+#include <apt-pkg/fileutl.h>
 
 #include <dirent.h>
 #include <sys/stat.h>
 #include <unistd.h>
+
+#include <apti18n.h>
 									/*}}}*/
 // ArchiveCleaner::Go - Perform smart cleanup of the archive		/*{{{*/
 // ---------------------------------------------------------------------
 /* Scan the directory for files to erase, we check the version information
    against our database to see if it is interesting */
-bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache)
+bool pkgArchiveCleaner::Go(std::string Dir,pkgCache &Cache)
 {
    bool CleanInstalled = _config->FindB("APT::Clean-Installed",true);
       
@@ -32,7 +35,7 @@ bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache)
    if (D == 0)
       return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
 
-   string StartDir = SafeGetCWD();
+   std::string StartDir = SafeGetCWD();
    if (chdir(Dir.c_str()) != 0)
    {
       closedir(D);
@@ -51,9 +54,11 @@ bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache)
       struct stat St;
       if (stat(Dir->d_name,&St) != 0)
       {
-	 chdir(StartDir.c_str());
+	 _error->Errno("stat",_("Unable to stat %s."),Dir->d_name);
 	 closedir(D);
-	 return _error->Errno("stat",_("Unable to stat %s."),Dir->d_name);
+	 if (chdir(StartDir.c_str()) != 0)
+	    return _error->Errno("chdir", _("Unable to change to %s"), StartDir.c_str());
+	 return false;
       }
       
       // Grab the package name
@@ -61,21 +66,21 @@ bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache)
       for (; *I != 0 && *I != '_';I++);
       if (*I != '_')
 	 continue;
-      string Pkg = DeQuoteString(string(Dir->d_name,I-Dir->d_name));
+      std::string Pkg = DeQuoteString(std::string(Dir->d_name,I-Dir->d_name));
 
       // Grab the version
       const char *Start = I + 1;
       for (I = Start; *I != 0 && *I != '_';I++);
       if (*I != '_')
 	 continue;
-      string Ver = DeQuoteString(string(Start,I-Start));
+      std::string Ver = DeQuoteString(std::string(Start,I-Start));
   
       // Grab the arch
       Start = I + 1;
       for (I = Start; *I != 0 && *I != '.' ;I++);
       if (*I != '.')
 	 continue;
-      string const Arch = DeQuoteString(string(Start,I-Start));
+      std::string const Arch = DeQuoteString(std::string(Start,I-Start));
       
       if (APT::Configuration::checkArchitecture(Arch) == false)
 	 continue;
@@ -112,8 +117,9 @@ bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache)
       Erase(Dir->d_name,Pkg,Ver,St);
    };
    
-   chdir(StartDir.c_str());
    closedir(D);
-   return true;   
+   if (chdir(StartDir.c_str()) != 0)
+      return _error->Errno("chdir", _("Unable to change to %s"), StartDir.c_str());
+   return true;
 }
 									/*}}}*/
diff --git a/apt-pkg/clean.h b/apt-pkg/clean.h
index 2aee2bf54..ad4049e83 100644
--- a/apt-pkg/clean.h
+++ b/apt-pkg/clean.h
@@ -15,13 +15,16 @@
 
 class pkgArchiveCleaner
 {
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+
    protected:
    
-   virtual void Erase(const char * /*File*/,string /*Pkg*/,string /*Ver*/,struct stat & /*St*/) {};
+   virtual void Erase(const char * /*File*/,std::string /*Pkg*/,std::string /*Ver*/,struct stat & /*St*/) {};
 
    public:   
    
-   bool Go(string Dir,pkgCache &Cache);
+   bool Go(std::string Dir,pkgCache &Cache);
    virtual ~pkgArchiveCleaner() {};
 };
 
diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc
index e25caf1a5..187f6bd59 100644
--- a/apt-pkg/contrib/cdromutl.cc
+++ b/apt-pkg/contrib/cdromutl.cc
@@ -10,6 +10,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/cdromutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/md5.h>
@@ -17,8 +19,6 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 
-#include <apti18n.h>
-    
 #include <sys/wait.h>
 #include <sys/statvfs.h>
 #include <dirent.h>
@@ -26,8 +26,12 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <stdio.h>
+
+#include <apti18n.h>
 									/*}}}*/
 
+using std::string;
+
 // IsMounted - Returns true if the mount point is mounted		/*{{{*/
 // ---------------------------------------------------------------------
 /* This is a simple algorithm that should always work, we stat the mount point
diff --git a/apt-pkg/contrib/cdromutl.h b/apt-pkg/contrib/cdromutl.h
index 38ed2996e..e94045b5c 100644
--- a/apt-pkg/contrib/cdromutl.h
+++ b/apt-pkg/contrib/cdromutl.h
@@ -12,13 +12,15 @@
 
 #include <string>
 
+#ifndef APT_8_CLEANER_HEADERS
 using std::string;
+#endif
 
 // mount cdrom, DeviceName (e.g. /dev/sr0) is optional
-bool MountCdrom(string Path, string DeviceName="");
-bool UnmountCdrom(string Path);
-bool IdentCdrom(string CD,string &Res,unsigned int Version = 2);
-bool IsMounted(string &Path);
-string FindMountPointForDevice(const char *device);
+bool MountCdrom(std::string Path, std::string DeviceName="");
+bool UnmountCdrom(std::string Path);
+bool IdentCdrom(std::string CD,std::string &Res,unsigned int Version = 2);
+bool IsMounted(std::string &Path);
+std::string FindMountPointForDevice(const char *device);
 
 #endif
diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc
index f7359c36e..159f330a1 100644
--- a/apt-pkg/contrib/cmndline.cc
+++ b/apt-pkg/contrib/cmndline.cc
@@ -11,11 +11,14 @@
    ##################################################################### */
 									/*}}}*/
 // Include files							/*{{{*/
+#include<config.h>
+
+#include <apt-pkg/configuration.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 
-#include <apti18n.h>    
+#include <apti18n.h>
 									/*}}}*/
 using namespace std;
 
diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h
index 7c0c71aa7..9f505fd41 100644
--- a/apt-pkg/contrib/cmndline.h
+++ b/apt-pkg/contrib/cmndline.h
@@ -44,9 +44,11 @@
 #ifndef PKGLIB_CMNDLINE_H
 #define PKGLIB_CMNDLINE_H
 
-
-
+#ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/configuration.h>
+#endif
+
+class Configuration;
 
 class CommandLine
 {
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 2db191ba2..36866a35a 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -15,16 +15,19 @@
    ##################################################################### */
 									/*}}}*/
 // Include files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
-#include <apti18n.h>
 
 #include <vector>
 #include <fstream>
 #include <iostream>
 
+#include <apti18n.h>
+
 using namespace std;
 									/*}}}*/
 
@@ -182,8 +185,14 @@ string Configuration::FindFile(const char *Name,const char *Default) const
    }
    
    string val = Itm->Value;
-   while (Itm->Parent != 0 && Itm->Parent->Value.empty() == false)
-   {	 
+   while (Itm->Parent != 0)
+   {
+      if (Itm->Parent->Value.empty() == true)
+      {
+	 Itm = Itm->Parent;
+	 continue;
+      }
+
       // Absolute
       if (val.length() >= 1 && val[0] == '/')
          break;
diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index 2844ec097..4c2e75041 100644
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -34,7 +34,9 @@
 #include <vector>
 #include <iostream>
 
+#ifndef APT_8_CLEANER_HEADERS
 using std::string;
+#endif
 
 class Configuration
 {
@@ -42,13 +44,13 @@ class Configuration
    
    struct Item
    {
-      string Value;
-      string Tag;
+      std::string Value;
+      std::string Tag;
       Item *Parent;
       Item *Child;
       Item *Next;
       
-      string FullTag(const Item *Stop = 0) const;
+      std::string FullTag(const Item *Stop = 0) const;
       
       Item() : Parent(0), Child(0), Next(0) {};
    };
@@ -67,35 +69,35 @@ class Configuration
    
    public:
 
-   string Find(const char *Name,const char *Default = 0) const;
-   string Find(string const &Name,const char *Default = 0) const {return Find(Name.c_str(),Default);};
-   string Find(string const &Name, string const &Default) const {return Find(Name.c_str(),Default.c_str());};
-   string FindFile(const char *Name,const char *Default = 0) const;
-   string FindDir(const char *Name,const char *Default = 0) const;
-   std::vector<string> FindVector(const char *Name) const;
-   std::vector<string> FindVector(string const &Name) const { return FindVector(Name.c_str()); };
+   std::string Find(const char *Name,const char *Default = 0) const;
+   std::string Find(std::string const &Name,const char *Default = 0) const {return Find(Name.c_str(),Default);};
+   std::string Find(std::string const &Name, std::string const &Default) const {return Find(Name.c_str(),Default.c_str());};
+   std::string FindFile(const char *Name,const char *Default = 0) const;
+   std::string FindDir(const char *Name,const char *Default = 0) const;
+   std::vector<std::string> FindVector(const char *Name) const;
+   std::vector<std::string> FindVector(std::string const &Name) const { return FindVector(Name.c_str()); };
    int FindI(const char *Name,int const &Default = 0) const;
-   int FindI(string const &Name,int const &Default = 0) const {return FindI(Name.c_str(),Default);};
+   int FindI(std::string const &Name,int const &Default = 0) const {return FindI(Name.c_str(),Default);};
    bool FindB(const char *Name,bool const &Default = false) const;
-   bool FindB(string const &Name,bool const &Default = false) const {return FindB(Name.c_str(),Default);};
-   string FindAny(const char *Name,const char *Default = 0) const;
+   bool FindB(std::string const &Name,bool const &Default = false) const {return FindB(Name.c_str(),Default);};
+   std::string FindAny(const char *Name,const char *Default = 0) const;
 	      
-   inline void Set(const string &Name,const string &Value) {Set(Name.c_str(),Value);};
-   void CndSet(const char *Name,const string &Value);
+   inline void Set(const std::string &Name,const std::string &Value) {Set(Name.c_str(),Value);};
+   void CndSet(const char *Name,const std::string &Value);
    void CndSet(const char *Name,const int Value);
-   void Set(const char *Name,const string &Value);
+   void Set(const char *Name,const std::string &Value);
    void Set(const char *Name,const int &Value);
    
-   inline bool Exists(const string &Name) const {return Exists(Name.c_str());};
+   inline bool Exists(const std::string &Name) const {return Exists(Name.c_str());};
    bool Exists(const char *Name) const;
    bool ExistsAny(const char *Name) const;
 
    // clear a whole tree
-   void Clear(const string &Name);
+   void Clear(const std::string &Name);
 
    // remove a certain value from a list (e.g. the list of "APT::Keep-Fds")
-   void Clear(string const &List, string const &Value);
-   void Clear(string const &List, int const &Value);
+   void Clear(std::string const &List, std::string const &Value);
+   void Clear(std::string const &List, int const &Value);
 
    inline const Item *Tree(const char *Name) const {return Lookup(Name);};
 
@@ -127,11 +129,11 @@ class Configuration
 
 extern Configuration *_config;
 
-bool ReadConfigFile(Configuration &Conf,const string &FName,
+bool ReadConfigFile(Configuration &Conf,const std::string &FName,
 		    bool const &AsSectional = false,
 		    unsigned const &Depth = 0);
 
-bool ReadConfigDir(Configuration &Conf,const string &Dir,
+bool ReadConfigDir(Configuration &Conf,const std::string &Dir,
 		   bool const &AsSectional = false,
 		   unsigned const &Depth = 0);
 
diff --git a/apt-pkg/contrib/crc-16.cc b/apt-pkg/contrib/crc-16.cc
index b300ed67e..4058821f9 100644
--- a/apt-pkg/contrib/crc-16.cc
+++ b/apt-pkg/contrib/crc-16.cc
@@ -15,6 +15,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/crc-16.h>
 									/*}}}*/
 
@@ -63,7 +65,7 @@ static unsigned short const crc16_table[256] =
 /* Recompute the FCS with one more character appended. */
 #define CalcFCS(fcs, c) (((fcs) >> 8) ^ crc16_table[((fcs) ^ (c)) & 0xff])
 unsigned short AddCRC16(unsigned short fcs, void const *Buf,
-			unsigned long len) 
+			unsigned long long len)
 {
    unsigned char const *buf = (unsigned char const *)Buf;
    while (len--)
diff --git a/apt-pkg/contrib/crc-16.h b/apt-pkg/contrib/crc-16.h
index f30678bac..702de40b2 100644
--- a/apt-pkg/contrib/crc-16.h
+++ b/apt-pkg/contrib/crc-16.h
@@ -12,6 +12,6 @@
 
 #define INIT_FCS  0xffff
 unsigned short AddCRC16(unsigned short fcs, void const *buf,
-			unsigned long len);
+			unsigned long long len);
 
 #endif
diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index edb290f34..122e2c809 100644
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -13,6 +13,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/error.h>
 
 #include <iostream>
@@ -24,8 +26,7 @@
 #include <string>
 #include <cstring>
 
-#include "config.h"
-   									/*}}}*/
+									/*}}}*/
 
 // Global Error Object							/*{{{*/
 /* If the implementation supports posix threads then the accessor function
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 85dc6f600..9e3611b26 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -18,14 +18,15 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/sptr.h>
+#include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>
 
-#include <apti18n.h>
-
 #include <cstdlib>
 #include <cstring>
 #include <cstdio>
@@ -43,14 +44,45 @@
 #include <set>
 #include <algorithm>
 
-#include <config.h>
+#ifdef HAVE_ZLIB
+	#include <zlib.h>
+#endif
+#ifdef HAVE_BZ2
+	#include <bzlib.h>
+#endif
+
 #ifdef WORDS_BIGENDIAN
 #include <inttypes.h>
 #endif
+
+#include <apti18n.h>
 									/*}}}*/
 
 using namespace std;
 
+class FileFdPrivate {
+	public:
+#ifdef HAVE_ZLIB
+	gzFile gz;
+#else
+	void* gz;
+#endif
+#ifdef HAVE_BZ2
+	BZFILE* bz2;
+#else
+	void* bz2;
+#endif
+	int compressed_fd;
+	pid_t compressor_pid;
+	bool pipe;
+	APT::Configuration::Compressor compressor;
+	unsigned int openmode;
+	unsigned long long seekpos;
+	FileFdPrivate() : gz(NULL), bz2(NULL),
+			  compressed_fd(-1), compressor_pid(-1), pipe(false),
+			  openmode(0), seekpos(0) {};
+};
+
 // RunScripts - Run a set of scripts from a configuration subtree	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -132,10 +164,10 @@ bool CopyFile(FileFd &From,FileFd &To)
    
    // Buffered copy between fds
    SPtrArray<unsigned char> Buf = new unsigned char[64000];
-   unsigned long Size = From.Size();
+   unsigned long long Size = From.Size();
    while (Size != 0)
    {
-      unsigned long ToRead = Size;
+      unsigned long long ToRead = Size;
       if (Size > 64000)
 	 ToRead = 64000;
       
@@ -358,6 +390,13 @@ std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> c
       {
 	 if (RealFileExists(File.c_str()) == false)
 	 {
+	    // do not show ignoration warnings for directories
+	    if (
+#ifdef _DIRENT_HAVE_D_TYPE
+		Ent->d_type == DT_DIR ||
+#endif
+		DirectoryExists(File.c_str()) == true)
+	       continue;
 	    if (SilentIgnore.Match(Ent->d_name) == false)
 	       _error->Notice(_("Ignoring '%s' in directory '%s' as it is not a regular file"), Ent->d_name, Dir.c_str());
 	    continue;
@@ -429,6 +468,80 @@ std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> c
       std::sort(List.begin(),List.end());
    return List;
 }
+std::vector<string> GetListOfFilesInDir(string const &Dir, bool SortList)
+{
+   bool const Debug = _config->FindB("Debug::GetListOfFilesInDir", false);
+   if (Debug == true)
+      std::clog << "Accept in " << Dir << " all regular files" << std::endl;
+
+   std::vector<string> List;
+
+   if (DirectoryExists(Dir.c_str()) == false)
+   {
+      _error->Error(_("List of files can't be created as '%s' is not a directory"), Dir.c_str());
+      return List;
+   }
+
+   DIR *D = opendir(Dir.c_str());
+   if (D == 0)
+   {
+      _error->Errno("opendir",_("Unable to read %s"),Dir.c_str());
+      return List;
+   }
+
+   for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) 
+   {
+      // skip "hidden" files
+      if (Ent->d_name[0] == '.')
+	 continue;
+
+      // Make sure it is a file and not something else
+      string const File = flCombine(Dir,Ent->d_name);
+#ifdef _DIRENT_HAVE_D_TYPE
+      if (Ent->d_type != DT_REG)
+#endif
+      {
+	 if (RealFileExists(File.c_str()) == false)
+	 {
+	    if (Debug == true)
+	       std::clog << "Bad file: " << Ent->d_name << " → it is not a real file" << std::endl;
+	    continue;
+	 }
+      }
+
+      // Skip bad filenames ala run-parts
+      const char *C = Ent->d_name;
+      for (; *C != 0; ++C)
+	 if (isalpha(*C) == 0 && isdigit(*C) == 0
+	     && *C != '_' && *C != '-' && *C != '.')
+	    break;
+
+      // we don't reach the end of the name -> bad character included
+      if (*C != 0)
+      {
+	 if (Debug == true)
+	    std::clog << "Bad file: " << Ent->d_name << " → bad character »" << *C << "« in filename" << std::endl;
+	 continue;
+      }
+
+      // skip filenames which end with a period. These are never valid
+      if (*(C - 1) == '.')
+      {
+	 if (Debug == true)
+	    std::clog << "Bad file: " << Ent->d_name << " → Period as last character" << std::endl;
+	 continue;
+      }
+
+      if (Debug == true)
+	 std::clog << "Accept file: " << Ent->d_name << " in " << Dir << std::endl;
+      List.push_back(File);
+   }
+   closedir(D);
+
+   if (SortList == true)
+      std::sort(List.begin(),List.end());
+   return List;
+}
 									/*}}}*/
 // SafeGetCWD - This is a safer getcwd that returns a dynamic string	/*{{{*/
 // ---------------------------------------------------------------------
@@ -717,83 +830,306 @@ bool ExecWait(pid_t Pid,const char *Name,bool Reap)
 // FileFd::Open - Open a file						/*{{{*/
 // ---------------------------------------------------------------------
 /* The most commonly used open mode combinations are given with Mode */
-bool FileFd::Open(string FileName,OpenMode Mode, unsigned long Perms)
+bool FileFd::Open(string FileName,unsigned int const Mode,CompressMode Compress, unsigned long const Perms)
 {
-   Close();
-   Flags = AutoClose;
-   switch (Mode)
+   if (Mode == ReadOnlyGzip)
+      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());
+
+   std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors();
+   std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin();
+   if (Compress == Auto)
    {
-      case ReadOnly:
-      iFd = open(FileName.c_str(),O_RDONLY);
-      break;
-
-      case ReadOnlyGzip:
-      iFd = open(FileName.c_str(),O_RDONLY);
-      if (iFd > 0) {
-	 gz = gzdopen (iFd, "r");
-	 if (gz == NULL) {
-	     close (iFd);
-	     iFd = -1;
-	 }
-      }
-      break;
-      
-      case WriteAtomic:
+      for (; compressor != compressors.end(); ++compressor)
       {
-	 Flags |= Replace;
-	 char *name = strdup((FileName + ".XXXXXX").c_str());
-	 TemporaryFileName = string(mktemp(name));
-	 iFd = open(TemporaryFileName.c_str(),O_RDWR | O_CREAT | O_EXCL,Perms);
-	 free(name);
+	 std::string file = std::string(FileName).append(compressor->Extension);
+	 if (FileExists(file) == false)
+	    continue;
+	 FileName = file;
 	 break;
       }
-
-      case WriteEmpty:
+   }
+   else if (Compress == Extension)
+   {
+      std::string::size_type const found = FileName.find_last_of('.');
+      std::string ext;
+      if (found != std::string::npos)
       {
-      	 struct stat Buf;
-	 if (lstat(FileName.c_str(),&Buf) == 0 && S_ISLNK(Buf.st_mode))
-	    unlink(FileName.c_str());
-	 iFd = open(FileName.c_str(),O_RDWR | O_CREAT | O_TRUNC,Perms);
-	 break;
+	 ext = FileName.substr(found);
+	 if (ext == ".new" || ext == ".bak")
+	 {
+	    std::string::size_type const found2 = FileName.find_last_of('.', found - 1);
+	    if (found2 != std::string::npos)
+	       ext = FileName.substr(found2, found - found2);
+	    else
+	       ext.clear();
+	 }
       }
-      
-      case WriteExists:
-      iFd = open(FileName.c_str(),O_RDWR);
-      break;
+      for (; compressor != compressors.end(); ++compressor)
+	 if (ext == compressor->Extension)
+	    break;
+      // no matching extension - assume uncompressed (imagine files like 'example.org_Packages')
+      if (compressor == compressors.end())
+	 for (compressor = compressors.begin(); compressor != compressors.end(); ++compressor)
+	    if (compressor->Name == ".")
+	       break;
+   }
+   else
+   {
+      std::string name;
+      switch (Compress)
+      {
+      case None: name = "."; break;
+      case Gzip: name = "gzip"; break;
+      case Bzip2: name = "bzip2"; break;
+      case Lzma: name = "lzma"; break;
+      case Xz: name = "xz"; break;
+      case Auto:
+      case Extension:
+	 // Unreachable
+	 return _error->Error("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());
+   }
+
+   if (compressor == compressors.end())
+      return _error->Error("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)
+{
+   Close();
+   d = new FileFdPrivate;
+   d->openmode = Mode;
+   Flags = AutoClose;
 
-      case WriteAny:
-      iFd = open(FileName.c_str(),O_RDWR | O_CREAT,Perms);
-      break;      
+   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());
+   if ((Mode & ReadWrite) == 0)
+      return _error->Error("No openmode provided in FileFd::Open for %s", FileName.c_str());
 
-      case WriteTemp:
+   if ((Mode & Atomic) == Atomic)
+   {
+      Flags |= Replace;
+      char *name = strdup((FileName + ".XXXXXX").c_str());
+      TemporaryFileName = string(mktemp(name));
+      free(name);
+   }
+   else if ((Mode & (Exclusive | Create)) == (Exclusive | Create))
+   {
+      // for atomic, this will be done by rename in Close()
       unlink(FileName.c_str());
-      iFd = open(FileName.c_str(),O_RDWR | O_CREAT | O_EXCL,Perms);
-      break;
-   }  
+   }
+   if ((Mode & Empty) == Empty)
+   {
+      struct stat Buf;
+      if (lstat(FileName.c_str(),&Buf) == 0 && S_ISLNK(Buf.st_mode))
+	 unlink(FileName.c_str());
+   }
+
+   int fileflags = 0;
+   #define if_FLAGGED_SET(FLAG, MODE) if ((Mode & FLAG) == FLAG) fileflags |= MODE
+   if_FLAGGED_SET(ReadWrite, O_RDWR);
+   else if_FLAGGED_SET(ReadOnly, O_RDONLY);
+   else if_FLAGGED_SET(WriteOnly, O_WRONLY);
+
+   if_FLAGGED_SET(Create, O_CREAT);
+   if_FLAGGED_SET(Empty, O_TRUNC);
+   if_FLAGGED_SET(Exclusive, O_EXCL);
+   else if_FLAGGED_SET(Atomic, O_EXCL);
+   #undef if_FLAGGED_SET
+
+   if (TemporaryFileName.empty() == false)
+      iFd = open(TemporaryFileName.c_str(), fileflags, Perms);
+   else
+      iFd = open(FileName.c_str(), fileflags, Perms);
 
-   if (iFd < 0)
-      return _error->Errno("open",_("Could not open file %s"),FileName.c_str());
-   
    this->FileName = FileName;
+   if (iFd == -1 || OpenInternDescriptor(Mode, compressor) == false)
+   {
+      if (iFd != -1)
+      {
+	 close (iFd);
+	 iFd = -1;
+      }
+      return _error->Errno("open",_("Could not open file %s"), FileName.c_str());
+   }
+
    SetCloseExec(iFd,true);
    return true;
 }
+									/*}}}*/
+// FileFd::OpenDescriptor - Open a filedescriptor			/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, CompressMode Compress, bool AutoClose)
+{
+   std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors();
+   std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin();
+   std::string name;
+
+   // compat with the old API
+   if (Mode == ReadOnlyGzip && Compress == None)
+      Compress = Gzip;
 
-bool FileFd::OpenDescriptor(int Fd, OpenMode Mode, bool AutoClose)
+   switch (Compress)
+   {
+   case None: name = "."; break;
+   case Gzip: name = "gzip"; break;
+   case Bzip2: name = "bzip2"; break;
+   case Lzma: name = "lzma"; break;
+   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);
+   }
+   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 OpenDescriptor(Fd, Mode, *compressor, AutoClose);
+}
+bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration::Compressor const &compressor, bool AutoClose)
 {
    Close();
+   d = new FileFdPrivate;
+   d->openmode = Mode;
    Flags = (AutoClose) ? FileFd::AutoClose : 0;
    iFd = Fd;
-   if (Mode == ReadOnlyGzip) {
-      gz = gzdopen (iFd, "r");
-      if (gz == NULL) {
-	 if (AutoClose)
-	    close (iFd);
-	 return _error->Errno("gzdopen",_("Could not open file descriptor %d"),
-			      Fd);
+   this->FileName = "";
+   if (OpenInternDescriptor(Mode, compressor) == false)
+   {
+      if (AutoClose)
+	 close (iFd);
+      return _error->Errno("gzdopen",_("Could not open file descriptor %d"), Fd);
+   }
+   return true;
+}
+bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor)
+{
+   d->compressor = compressor;
+   if (compressor.Name == "." || compressor.Binary.empty() == true)
+      return true;
+#ifdef HAVE_ZLIB
+   else if (compressor.Name == "gzip")
+   {
+      if ((Mode & ReadWrite) == ReadWrite)
+	 d->gz = gzdopen(iFd, "r+");
+      else if ((Mode & WriteOnly) == WriteOnly)
+	 d->gz = gzdopen(iFd, "w");
+      else
+	 d->gz = gzdopen(iFd, "r");
+      if (d->gz == NULL)
+	 return false;
+      Flags |= Compressed;
+      return true;
+   }
+#endif
+#ifdef HAVE_BZ2
+   else if (compressor.Name == "bzip2")
+   {
+      if ((Mode & ReadWrite) == ReadWrite)
+	 d->bz2 = BZ2_bzdopen(iFd, "r+");
+      else if ((Mode & WriteOnly) == WriteOnly)
+	 d->bz2 = BZ2_bzdopen(iFd, "w");
+      else
+	 d->bz2 = BZ2_bzdopen(iFd, "r");
+      if (d->bz2 == NULL)
+	 return false;
+      Flags |= Compressed;
+      return true;
+   }
+#endif
+
+
+   if ((Mode & ReadWrite) == ReadWrite)
+      return _error->Error("ReadWrite mode is not supported for file %s", FileName.c_str());
+
+   bool const Comp = (Mode & WriteOnly) == WriteOnly;
+   // Handle 'decompression' of empty files
+   if (Comp == false)
+   {
+      struct stat Buf;
+      fstat(iFd, &Buf);
+      if (Buf.st_size == 0 && S_ISFIFO(Buf.st_mode) == false)
+	 return true;
+
+      // We don't need the file open - instead let the compressor open it
+      // as he properly knows better how to efficiently read from 'his' file
+      if (FileName.empty() == false)
+	 close(iFd);
+   }
+
+   // Create a data pipe
+   int Pipe[2] = {-1,-1};
+   if (pipe(Pipe) != 0)
+      return _error->Errno("pipe",_("Failed to create subprocess IPC"));
+   for (int J = 0; J != 2; J++)
+      SetCloseExec(Pipe[J],true);
+
+   d->compressed_fd = iFd;
+   d->pipe = true;
+
+   if (Comp == true)
+      iFd = Pipe[1];
+   else
+      iFd = Pipe[0];
+
+   // The child..
+   d->compressor_pid = ExecFork();
+   if (d->compressor_pid == 0)
+   {
+      if (Comp == true)
+      {
+	 dup2(d->compressed_fd,STDOUT_FILENO);
+	 dup2(Pipe[0],STDIN_FILENO);
+      }
+      else
+      {
+	 if (FileName.empty() == true)
+	    dup2(d->compressed_fd,STDIN_FILENO);
+	 dup2(Pipe[1],STDOUT_FILENO);
+      }
+
+      SetCloseExec(STDOUT_FILENO,false);
+      SetCloseExec(STDIN_FILENO,false);
+
+      std::vector<char const*> Args;
+      Args.push_back(compressor.Binary.c_str());
+      std::vector<std::string> const * const addArgs =
+		(Comp == true) ? &(compressor.CompressArgs) : &(compressor.UncompressArgs);
+      for (std::vector<std::string>::const_iterator a = addArgs->begin();
+	   a != addArgs->end(); ++a)
+	 Args.push_back(a->c_str());
+      if (Comp == false && FileName.empty() == false)
+      {
+	 Args.push_back("--stdout");
+	 if (TemporaryFileName.empty() == false)
+	    Args.push_back(TemporaryFileName.c_str());
+	 else
+	    Args.push_back(FileName.c_str());
       }
+      Args.push_back(NULL);
+
+      execvp(Args[0],(char **)&Args[0]);
+      cerr << _("Failed to exec compressor ") << Args[0] << endl;
+      _exit(100);
    }
-   this->FileName = "";
+   if (Comp == true)
+      close(Pipe[0]);
+   else
+      close(Pipe[1]);
+   if (Comp == true || FileName.empty() == true)
+      close(d->compressed_fd);
+
    return true;
 }
 									/*}}}*/
@@ -810,29 +1146,56 @@ FileFd::~FileFd()
 // ---------------------------------------------------------------------
 /* We are carefull to handle interruption by a signal while reading 
    gracefully. */
-bool FileFd::Read(void *To,unsigned long Size,unsigned long *Actual)
+bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
 {
    int Res;
    errno = 0;
    if (Actual != 0)
       *Actual = 0;
-   
+   *((char *)To) = '\0';
    do
    {
-      if (gz != NULL)
-         Res = gzread(gz,To,Size);
+#ifdef HAVE_ZLIB
+      if (d->gz != NULL)
+	 Res = gzread(d->gz,To,Size);
+      else
+#endif
+#ifdef HAVE_BZ2
+      if (d->bz2 != NULL)
+	 Res = BZ2_bzread(d->bz2,To,Size);
       else
+#endif
          Res = read(iFd,To,Size);
-      if (Res < 0 && errno == EINTR)
-	 continue;
+
       if (Res < 0)
       {
+	 if (errno == EINTR)
+	    continue;
 	 Flags |= Fail;
+#ifdef HAVE_ZLIB
+	 if (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);
+	 }
+#endif
+#ifdef HAVE_BZ2
+	 if (d->bz2 != NULL)
+	 {
+	    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);
+	 }
+#endif
 	 return _error->Errno("read",_("Read error"));
       }
       
       To = (char *)To + Res;
       Size -= Res;
+      d->seekpos += Res;
       if (Actual != 0)
 	 *Actual += Res;
    }
@@ -849,32 +1212,87 @@ bool FileFd::Read(void *To,unsigned long Size,unsigned long *Actual)
    }
    
    Flags |= Fail;
-   return _error->Error(_("read, still have %lu to read but none left"),Size);
+   return _error->Error(_("read, still have %llu to read but none left"), Size);
+}
+									/*}}}*/
+// FileFd::ReadLine - Read a complete line from the file		/*{{{*/
+// ---------------------------------------------------------------------
+/* Beware: This method can be quiet slow for big buffers on UNcompressed
+   files because of the naive implementation! */
+char* FileFd::ReadLine(char *To, unsigned long long const Size)
+{
+   *To = '\0';
+#ifdef HAVE_ZLIB
+   if (d->gz != NULL)
+      return gzgets(d->gz, To, Size);
+#endif
+
+   unsigned long long read = 0;
+   while ((Size - 1) != read)
+   {
+      unsigned long long done = 0;
+      if (Read(To + read, 1, &done) == false)
+	 return NULL;
+      if (done == 0)
+	 break;
+      if (To[read++] == '\n')
+	 break;
+   }
+   if (read == 0)
+      return NULL;
+   To[read] = '\0';
+   return To;
 }
 									/*}}}*/
 // FileFd::Write - Write to the file					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool FileFd::Write(const void *From,unsigned long Size)
+bool FileFd::Write(const void *From,unsigned long long Size)
 {
    int Res;
    errno = 0;
    do
    {
-      if (gz != NULL)
-         Res = gzwrite(gz,From,Size);
+#ifdef HAVE_ZLIB
+      if (d->gz != NULL)
+         Res = gzwrite(d->gz,From,Size);
       else
+#endif
+#ifdef HAVE_BZ2
+      if (d->bz2 != NULL)
+         Res = BZ2_bzwrite(d->bz2,(void*)From,Size);
+      else
+#endif
          Res = write(iFd,From,Size);
       if (Res < 0 && errno == EINTR)
 	 continue;
       if (Res < 0)
       {
 	 Flags |= Fail;
+#ifdef HAVE_ZLIB
+	 if (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);
+	 }
+#endif
+#ifdef HAVE_BZ2
+	 if (d->bz2 != NULL)
+	 {
+	    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);
+	 }
+#endif
 	 return _error->Errno("write",_("Write error"));
       }
       
       From = (char *)From + Res;
       Size -= Res;
+      d->seekpos += Res;
    }
    while (Res > 0 && Size > 0);
    
@@ -882,61 +1300,152 @@ bool FileFd::Write(const void *From,unsigned long Size)
       return true;
    
    Flags |= Fail;
-   return _error->Error(_("write, still have %lu to write but couldn't"),Size);
+   return _error->Error(_("write, still have %llu to write but couldn't"), Size);
+}
+bool FileFd::Write(int Fd, const void *From, unsigned long long Size)
+{
+   int Res;
+   errno = 0;
+   do
+   {
+      Res = write(Fd,From,Size);
+      if (Res < 0 && errno == EINTR)
+	 continue;
+      if (Res < 0)
+	 return _error->Errno("write",_("Write error"));
+
+      From = (char *)From + Res;
+      Size -= Res;
+   }
+   while (Res > 0 && Size > 0);
+
+   if (Size == 0)
+      return true;
+
+   return _error->Error(_("write, still have %llu to write but couldn't"), Size);
 }
 									/*}}}*/
 // FileFd::Seek - Seek in the file					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool FileFd::Seek(unsigned long To)
+bool FileFd::Seek(unsigned long long To)
 {
+   if (d->pipe == true
+#ifdef HAVE_BZ2
+	|| d->bz2 != NULL
+#endif
+	)
+   {
+      // Our poor man seeking in pipes is costly, so try to avoid it
+      unsigned long long seekpos = Tell();
+      if (seekpos == To)
+	 return true;
+      else if (seekpos < To)
+	 return Skip(To - seekpos);
+
+      if ((d->openmode & ReadOnly) != ReadOnly)
+	 return _error->Error("Reopen is only implemented for read-only files!");
+#ifdef HAVE_BZ2
+      if (d->bz2 != NULL)
+	 BZ2_bzclose(d->bz2);
+#endif
+      close(iFd);
+      iFd = 0;
+      if (TemporaryFileName.empty() == false)
+	 iFd = open(TemporaryFileName.c_str(), O_RDONLY);
+      else if (FileName.empty() == false)
+	 iFd = open(FileName.c_str(), O_RDONLY);
+      else
+      {
+	 if (d->compressed_fd > 0)
+	    if (lseek(d->compressed_fd, 0, SEEK_SET) != 0)
+	       iFd = d->compressed_fd;
+	 if (iFd <= 0)
+	    return _error->Error("Reopen is not implemented for pipes opened with FileFd::OpenDescriptor()!");
+      }
+
+      if (OpenInternDescriptor(d->openmode, d->compressor) == false)
+	 return _error->Error("Seek on file %s because it couldn't be reopened", FileName.c_str());
+
+      if (To != 0)
+	 return Skip(To);
+
+      d->seekpos = To;
+      return true;
+   }
    int res;
-   if (gz)
-      res = gzseek(gz,To,SEEK_SET);
+#ifdef HAVE_ZLIB
+   if (d->gz)
+      res = gzseek(d->gz,To,SEEK_SET);
    else
+#endif
       res = lseek(iFd,To,SEEK_SET);
    if (res != (signed)To)
    {
       Flags |= Fail;
-      return _error->Error("Unable to seek to %lu",To);
+      return _error->Error("Unable to seek to %llu", To);
    }
-   
+
+   d->seekpos = To;
    return true;
 }
 									/*}}}*/
 // FileFd::Skip - Seek in the file					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool FileFd::Skip(unsigned long Over)
+bool FileFd::Skip(unsigned long long Over)
 {
+   if (d->pipe == true
+#ifdef HAVE_BZ2
+	|| d->bz2 != NULL
+#endif
+	)
+   {
+      d->seekpos += Over;
+      char buffer[1024];
+      while (Over != 0)
+      {
+	 unsigned long long toread = std::min((unsigned long long) sizeof(buffer), Over);
+	 if (Read(buffer, toread) == false)
+	    return _error->Error("Unable to seek ahead %llu",Over);
+	 Over -= toread;
+      }
+      return true;
+   }
+
    int res;
-   if (gz)
-      res = gzseek(gz,Over,SEEK_CUR);
+#ifdef HAVE_ZLIB
+   if (d->gz != NULL)
+      res = gzseek(d->gz,Over,SEEK_CUR);
    else
+#endif
       res = lseek(iFd,Over,SEEK_CUR);
    if (res < 0)
    {
       Flags |= Fail;
-      return _error->Error("Unable to seek ahead %lu",Over);
+      return _error->Error("Unable to seek ahead %llu",Over);
    }
-   
+   d->seekpos = res;
+
    return true;
 }
 									/*}}}*/
 // FileFd::Truncate - Truncate the file 				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool FileFd::Truncate(unsigned long To)
+bool FileFd::Truncate(unsigned long long To)
 {
-   if (gz)
+#if defined HAVE_ZLIB || defined HAVE_BZ2
+   if (d->gz != NULL || d->bz2 != NULL)
    {
       Flags |= Fail;
-      return _error->Error("Truncating gzipped files is not implemented (%s)", FileName.c_str());
+      return _error->Error("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 %lu",To);
+      return _error->Error("Unable to truncate to %llu",To);
    }
    
    return true;
@@ -945,46 +1454,89 @@ bool FileFd::Truncate(unsigned long To)
 // FileFd::Tell - Current seek position					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-unsigned long FileFd::Tell()
+unsigned long long FileFd::Tell()
 {
+   // In theory, we could just return seekpos here always instead of
+   // seeking around, but not all users of FileFd use always Seek() and co
+   // so d->seekpos isn't always true and we can just use it as a hint if
+   // we have nothing else, but not always as an authority…
+   if (d->pipe == true
+#ifdef HAVE_BZ2
+	|| d->bz2 != NULL
+#endif
+	)
+      return d->seekpos;
+
    off_t Res;
-   if (gz)
-     Res = gztell(gz);
+#ifdef HAVE_ZLIB
+   if (d->gz != NULL)
+     Res = gztell(d->gz);
    else
+#endif
      Res = lseek(iFd,0,SEEK_CUR);
    if (Res == (off_t)-1)
       _error->Errno("lseek","Failed to determine the current file position");
+   d->seekpos = Res;
    return Res;
 }
 									/*}}}*/
 // FileFd::FileSize - Return the size of the file			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-unsigned long FileFd::FileSize()
+unsigned long long FileFd::FileSize()
 {
    struct stat Buf;
-
-   if (fstat(iFd,&Buf) != 0)
+   if (d->pipe == false && fstat(iFd,&Buf) != 0)
       return _error->Errno("fstat","Unable to determine the file size");
+
+   // for compressor pipes st_size is undefined and at 'best' zero
+   if (d->pipe == true || S_ISFIFO(Buf.st_mode))
+   {
+      // we set it here, too, as we get the info here for free
+      // in theory the Open-methods should take care of it already
+      d->pipe = true;
+      if (stat(FileName.c_str(), &Buf) != 0)
+	 return _error->Errno("stat","Unable to determine the file size");
+   }
+
    return Buf.st_size;
 }
 									/*}}}*/
 // FileFd::Size - Return the size of the content in the file		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-unsigned long FileFd::Size()
+unsigned long long FileFd::Size()
 {
-   unsigned long size = FileSize();
+   unsigned long long size = FileSize();
 
+   // for compressor pipes st_size is undefined and at 'best' zero,
+   // so we 'read' the content and 'seek' back - see there
+   if (d->pipe == true
+#ifdef HAVE_BZ2
+	|| (d->bz2 && size > 0)
+#endif
+	)
+   {
+      unsigned long long const oldSeek = Tell();
+      char ignore[1000];
+      unsigned long long read = 0;
+      do {
+	 Read(ignore, sizeof(ignore), &read);
+      } while(read != 0);
+      size = Tell();
+      Seek(oldSeek);
+   }
+#ifdef HAVE_ZLIB
    // only check gzsize if we are actually a gzip file, just checking for
-   // "gz" is not sufficient as uncompressed files will be opened with
+   // "gz" is not sufficient as uncompressed files could be opened with
    // gzopen in "direct" mode as well
-   if (gz && !gzdirect(gz) && size > 0)
+   else if (d->gz && !gzdirect(d->gz) && size > 0)
    {
+       off_t const oldPos = lseek(iFd,0,SEEK_CUR);
        /* unfortunately zlib.h doesn't provide a gzsize(), so we have to do
 	* this ourselves; the original (uncompressed) file size is the last 32
 	* bits of the file */
-       off_t orig_pos = lseek(iFd, 0, SEEK_CUR);
+       // FIXME: Size for gz-files is limited by 32bit… no largefile support
        if (lseek(iFd, -4, SEEK_END) < 0)
 	   return _error->Errno("lseek","Unable to seek to end of gzipped file");
        size = 0L;
@@ -998,28 +1550,68 @@ unsigned long FileFd::Size()
        size = tmp_size;
 #endif
 
-       if (lseek(iFd, orig_pos, SEEK_SET) < 0)
+       if (lseek(iFd, oldPos, SEEK_SET) < 0)
 	   return _error->Errno("lseek","Unable to seek in gzipped file");
+
        return size;
    }
+#endif
 
    return size;
 }
 									/*}}}*/
+// FileFd::ModificationTime - Return the time of last touch		/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+time_t FileFd::ModificationTime()
+{
+   struct stat Buf;
+   if (d->pipe == false && fstat(iFd,&Buf) != 0)
+   {
+      _error->Errno("fstat","Unable to determine the modification time of file %s", FileName.c_str());
+      return 0;
+   }
+
+   // for compressor pipes st_size is undefined and at 'best' zero
+   if (d->pipe == true || S_ISFIFO(Buf.st_mode))
+   {
+      // we set it here, too, as we get the info here for free
+      // in theory the Open-methods should take care of it already
+      d->pipe = true;
+      if (stat(FileName.c_str(), &Buf) != 0)
+      {
+	 _error->Errno("fstat","Unable to determine the modification time of file %s", FileName.c_str());
+	 return 0;
+      }
+   }
+
+   return Buf.st_mtime;
+}
+									/*}}}*/
 // FileFd::Close - Close the file if the close flag is set		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool FileFd::Close()
 {
+   if (iFd == -1)
+      return true;
+
    bool Res = true;
    if ((Flags & AutoClose) == AutoClose)
    {
-      if (gz != NULL) {
-	 int const e = gzclose(gz);
-	 // gzdopen() on empty files always fails with "buffer error" here, ignore that
+#ifdef HAVE_ZLIB
+      if (d != NULL && d->gz != NULL) {
+	 int const e = gzclose(d->gz);
+	 // gzdclose() on empty files always fails with "buffer error" here, ignore that
 	 if (e != 0 && e != Z_BUF_ERROR)
 	    Res &= _error->Errno("close",_("Problem closing the gzip file %s"), FileName.c_str());
       } else
+#endif
+#ifdef HAVE_BZ2
+      if (d != NULL && d->bz2 != NULL)
+	 BZ2_bzclose(d->bz2);
+      else
+#endif
 	 if (iFd > 0 && close(iFd) != 0)
 	    Res &= _error->Errno("close",_("Problem closing the file %s"), FileName.c_str());
    }
@@ -1029,16 +1621,23 @@ bool FileFd::Close()
 	 Res &= _error->Errno("rename",_("Problem renaming the file %s to %s"), TemporaryFileName.c_str(), FileName.c_str());
 
       FileName = TemporaryFileName; // for the unlink() below.
+      TemporaryFileName.clear();
    }
 
    iFd = -1;
-   gz = NULL;
 
    if ((Flags & Fail) == Fail && (Flags & DelOnFail) == DelOnFail &&
        FileName.empty() == false)
       if (unlink(FileName.c_str()) != 0)
 	 Res &= _error->WarningE("unlnk",_("Problem unlinking the file %s"), FileName.c_str());
 
+   if (d != NULL)
+   {
+      if (d->compressor_pid > 0)
+	 ExecWait(d->compressor_pid, "FileFdCompressor", true);
+      delete d;
+      d = NULL;
+   }
 
    return Res;
 }
@@ -1055,3 +1654,5 @@ bool FileFd::Sync()
    return true;
 }
 									/*}}}*/
+
+gzFile FileFd::gzFd() { return (gzFile) d->gz; }
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index a1b177f38..426664d3a 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -22,82 +22,143 @@
 #define PKGLIB_FILEUTL_H
 
 #include <apt-pkg/macros.h>
+#include <apt-pkg/aptconfiguration.h>
 
 #include <string>
 #include <vector>
 
 #include <zlib.h>
 
+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif
+
 /* Define this for python-apt */
 #define APT_HAS_GZIP 1
 
-using std::string;
-
+class FileFdPrivate;
 class FileFd
 {
    protected:
    int iFd;
  
    enum LocalFlags {AutoClose = (1<<0),Fail = (1<<1),DelOnFail = (1<<2),
-                    HitEof = (1<<3), Replace = (1<<4) };
+                    HitEof = (1<<3), Replace = (1<<4), Compressed = (1<<5) };
    unsigned long Flags;
-   string FileName;
-   string TemporaryFileName;
-   gzFile gz;
+   std::string FileName;
+   std::string TemporaryFileName;
 
    public:
-   enum OpenMode {ReadOnly,WriteEmpty,WriteExists,WriteAny,WriteTemp,ReadOnlyGzip,
-                  WriteAtomic};
+   enum OpenMode {
+	ReadOnly = (1 << 0),
+	WriteOnly = (1 << 1),
+	ReadWrite = ReadOnly | WriteOnly,
+
+	Create = (1 << 2),
+	Exclusive = (1 << 3),
+	Atomic = Exclusive | (1 << 4),
+	Empty = (1 << 5),
+
+	WriteEmpty = ReadWrite | Create | Empty,
+	WriteExists = ReadWrite,
+	WriteAny = ReadWrite | Create,
+	WriteTemp = ReadWrite | Create | Exclusive,
+	ReadOnlyGzip,
+	WriteAtomic = ReadWrite | Create | Atomic
+   };
+   enum CompressMode { Auto = 'A', None = 'N', Extension = 'E', Gzip = 'G', Bzip2 = 'B', Lzma = 'L', Xz = 'X' };
    
-   inline bool Read(void *To,unsigned long Size,bool AllowEof)
+   inline bool Read(void *To,unsigned long long Size,bool AllowEof)
    {
-      unsigned long Jnk;
+      unsigned long long Jnk;
       if (AllowEof)
 	 return Read(To,Size,&Jnk);
       return Read(To,Size);
    }   
-   bool Read(void *To,unsigned long Size,unsigned long *Actual = 0);
-   bool Write(const void *From,unsigned long Size);
-   bool Seek(unsigned long To);
-   bool Skip(unsigned long To);
-   bool Truncate(unsigned long To);
-   unsigned long Tell();
-   unsigned long Size();
-   unsigned long FileSize();
-   bool Open(string FileName,OpenMode Mode,unsigned long Perms = 0666);
-   bool OpenDescriptor(int Fd, OpenMode Mode, bool AutoClose=false);
+   bool Read(void *To,unsigned long long Size,unsigned long long *Actual = 0);
+   char* ReadLine(char *To, unsigned long long const Size);
+   bool Write(const void *From,unsigned long long Size);
+   bool static Write(int Fd, const void *From, unsigned long long Size);
+   bool Seek(unsigned long long To);
+   bool Skip(unsigned long long To);
+   bool Truncate(unsigned long long To);
+   unsigned long long Tell();
+   unsigned long long Size();
+   unsigned long long FileSize();
+   time_t ModificationTime();
+
+   /* You want to use 'unsigned long long' if you are talking about a file
+      to be able to support large files (>2 or >4 GB) properly.
+      This shouldn't happen all to often for the indexes, but deb's might be…
+      And as the auto-conversation converts a 'unsigned long *' to a 'bool'
+      instead of 'unsigned long long *' we need to provide this explicitely -
+      otherwise applications magically start to fail… */
+   __deprecated bool Read(void *To,unsigned long long Size,unsigned long *Actual)
+   {
+	unsigned long long R;
+	bool const T = Read(To, Size, &R);
+	*Actual = R;
+	return T;
+   }
+
+   bool Open(std::string FileName,unsigned int const Mode,CompressMode Compress,unsigned long const Perms = 0666);
+   bool Open(std::string FileName,unsigned int const Mode,APT::Configuration::Compressor const &compressor,unsigned long const Perms = 0666);
+   inline bool Open(std::string const &FileName,unsigned int const Mode, unsigned long const Perms = 0666) {
+      return Open(FileName, Mode, None, Perms);
+   };
+   bool OpenDescriptor(int Fd, unsigned int const Mode, CompressMode Compress, bool AutoClose=false);
+   bool OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration::Compressor const &compressor, bool AutoClose=false);
+   inline bool OpenDescriptor(int Fd, unsigned int const Mode, bool AutoClose=false) {
+      return OpenDescriptor(Fd, Mode, None, AutoClose);
+   };
    bool Close();
    bool Sync();
    
    // Simple manipulators
    inline int Fd() {return iFd;};
-   inline void Fd(int fd) {iFd = fd;};
-   inline gzFile gzFd() {return gz;};
+   inline void Fd(int fd) { OpenDescriptor(fd, ReadWrite);};
+   __deprecated gzFile gzFd();
+
    inline bool IsOpen() {return iFd >= 0;};
    inline bool Failed() {return (Flags & Fail) == Fail;};
    inline void EraseOnFailure() {Flags |= DelOnFail;};
    inline void OpFail() {Flags |= Fail;};
    inline bool Eof() {return (Flags & HitEof) == HitEof;};
-   inline string &Name() {return FileName;};
+   inline bool IsCompressed() {return (Flags & Compressed) == Compressed;};
+   inline std::string &Name() {return FileName;};
    
-   FileFd(string FileName,OpenMode Mode,unsigned long Perms = 0666) : iFd(-1), 
-            Flags(0), gz(NULL)
+   FileFd(std::string FileName,unsigned int const Mode,unsigned long Perms = 0666) : iFd(-1), Flags(0), d(NULL)
+   {
+      Open(FileName,Mode, None, Perms);
+   };
+   FileFd(std::string FileName,unsigned int const Mode, CompressMode Compress, unsigned long Perms = 0666) : iFd(-1), Flags(0), d(NULL)
    {
-      Open(FileName,Mode,Perms);
+      Open(FileName,Mode, Compress, Perms);
+   };
+   FileFd() : iFd(-1), Flags(AutoClose), d(NULL) {};
+   FileFd(int const Fd, unsigned int const Mode = ReadWrite, CompressMode Compress = None) : iFd(-1), Flags(0), d(NULL)
+   {
+      OpenDescriptor(Fd, Mode, Compress);
+   };
+   FileFd(int const Fd, bool const AutoClose) : iFd(-1), Flags(0), d(NULL)
+   {
+      OpenDescriptor(Fd, ReadWrite, None, AutoClose);
    };
-   FileFd(int Fd = -1) : iFd(Fd), Flags(AutoClose), gz(NULL) {};
-   FileFd(int Fd,bool) : iFd(Fd), Flags(0), gz(NULL) {};
    virtual ~FileFd();
+
+   private:
+   FileFdPrivate* d;
+   bool OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor);
 };
 
 bool RunScripts(const char *Cnf);
 bool CopyFile(FileFd &From,FileFd &To);
-int GetLock(string File,bool Errors = true);
-bool FileExists(string File);
-bool RealFileExists(string File);
-bool DirectoryExists(string const &Path) __attrib_const;
-bool CreateDirectory(string const &Parent, string const &Path);
-time_t GetModificationTime(string const &Path);
+int GetLock(std::string File,bool Errors = true);
+bool FileExists(std::string File);
+bool RealFileExists(std::string File);
+bool DirectoryExists(std::string const &Path) __attrib_const;
+bool CreateDirectory(std::string const &Parent, std::string const &Path);
+time_t GetModificationTime(std::string const &Path);
 
 /** \brief Ensure the existence of the given Path
  *
@@ -105,13 +166,14 @@ time_t GetModificationTime(string const &Path);
  *  /apt/ will be removed before CreateDirectory call.
  *  \param Path which should exist after (successful) call
  */
-bool CreateAPTDirectoryIfNeeded(string const &Parent, string const &Path);
+bool CreateAPTDirectoryIfNeeded(std::string const &Parent, std::string const &Path);
 
-std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext,
+std::vector<std::string> GetListOfFilesInDir(std::string const &Dir, std::string const &Ext,
 					bool const &SortList, bool const &AllowNoExt=false);
-std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> const &Ext,
+std::vector<std::string> GetListOfFilesInDir(std::string const &Dir, std::vector<std::string> const &Ext,
 					bool const &SortList);
-string SafeGetCWD();
+std::vector<std::string> GetListOfFilesInDir(std::string const &Dir, bool SortList);
+std::string SafeGetCWD();
 void SetCloseExec(int Fd,bool Close);
 void SetNonBlock(int Fd,bool Block);
 bool WaitFd(int Fd,bool write = false,unsigned long timeout = 0);
@@ -119,10 +181,10 @@ pid_t ExecFork();
 bool ExecWait(pid_t Pid,const char *Name,bool Reap = false);
 
 // File string manipulators
-string flNotDir(string File);
-string flNotFile(string File);
-string flNoLink(string File);
-string flExtension(string File);
-string flCombine(string Dir,string File);
+std::string flNotDir(std::string File);
+std::string flNotFile(std::string File);
+std::string flNoLink(std::string File);
+std::string flExtension(std::string File);
+std::string flCombine(std::string Dir,std::string File);
 
 #endif
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index 985d89d90..e1a431823 100644
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -11,39 +11,41 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/macros.h>
 
-#include <unistd.h>    
+#include <unistd.h>
 #include <string>
 #include <iostream>
 									/*}}}*/
 
 const char* HashString::_SupportedHashes[] = 
 {
-   "SHA256", "SHA1", "MD5Sum", NULL
+   "SHA512", "SHA256", "SHA1", "MD5Sum", NULL
 };
 
 HashString::HashString()
 {
 }
 
-HashString::HashString(string Type, string Hash) : Type(Type), Hash(Hash)
+HashString::HashString(std::string Type, std::string Hash) : Type(Type), Hash(Hash)
 {
 }
 
-HashString::HashString(string StringedHash)				/*{{{*/
+HashString::HashString(std::string StringedHash)			/*{{{*/
 {
    // legacy: md5sum without "MD5Sum:" prefix
-   if (StringedHash.find(":") == string::npos && StringedHash.size() == 32)
+   if (StringedHash.find(":") == std::string::npos && StringedHash.size() == 32)
    {
       Type = "MD5Sum";
       Hash = StringedHash;
       return;
    }
-   string::size_type pos = StringedHash.find(":");
+   std::string::size_type pos = StringedHash.find(":");
    Type = StringedHash.substr(0,pos);
    Hash = StringedHash.substr(pos+1, StringedHash.size() - pos);
 
@@ -51,29 +53,34 @@ HashString::HashString(string StringedHash)				/*{{{*/
       std::clog << "HashString(string): " << Type << " : " << Hash << std::endl;
 }
 									/*}}}*/
-bool HashString::VerifyFile(string filename) const			/*{{{*/
+bool HashString::VerifyFile(std::string filename) const			/*{{{*/
 {
-   FileFd fd;
-   MD5Summation MD5;
-   SHA1Summation SHA1;
-   SHA256Summation SHA256;
-   string fileHash;
+   std::string fileHash;
 
    FileFd Fd(filename, FileFd::ReadOnly);
-   if(Type == "MD5Sum") 
+   if(Type == "MD5Sum")
    {
-      MD5.AddFD(Fd.Fd(), Fd.Size());
-      fileHash = (string)MD5.Result();
-   } 
+      MD5Summation MD5;
+      MD5.AddFD(Fd);
+      fileHash = (std::string)MD5.Result();
+   }
    else if (Type == "SHA1")
    {
-      SHA1.AddFD(Fd.Fd(), Fd.Size());
-      fileHash = (string)SHA1.Result();
-   } 
-   else if (Type == "SHA256") 
+      SHA1Summation SHA1;
+      SHA1.AddFD(Fd);
+      fileHash = (std::string)SHA1.Result();
+   }
+   else if (Type == "SHA256")
    {
-      SHA256.AddFD(Fd.Fd(), Fd.Size());
-      fileHash = (string)SHA256.Result();
+      SHA256Summation SHA256;
+      SHA256.AddFD(Fd);
+      fileHash = (std::string)SHA256.Result();
+   }
+   else if (Type == "SHA512")
+   {
+      SHA512Summation SHA512;
+      SHA512.AddFD(Fd);
+      fileHash = (std::string)SHA512.Result();
    }
    Fd.Close();
 
@@ -93,34 +100,70 @@ bool HashString::empty() const
    return (Type.empty() || Hash.empty());
 }
 
-string HashString::toStr() const
+std::string HashString::toStr() const
 {
-   return Type+string(":")+Hash;
+   return Type + std::string(":") + Hash;
 }
 
 // Hashes::AddFD - Add the contents of the FD				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool Hashes::AddFD(int Fd,unsigned long Size)
+bool Hashes::AddFD(int const Fd,unsigned long long Size, bool const addMD5,
+		   bool const addSHA1, bool const addSHA256, bool const addSHA512)
 {
    unsigned char Buf[64*64];
-   int Res = 0;
+   ssize_t Res = 0;
    int ToEOF = (Size == 0);
    while (Size != 0 || ToEOF)
    {
-      unsigned n = sizeof(Buf);
-      if (!ToEOF) n = min(Size,(unsigned long)n);
+      unsigned long long n = sizeof(Buf);
+      if (!ToEOF) n = std::min(Size, n);
       Res = read(Fd,Buf,n);
-      if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read
-         return false;
+      if (Res < 0 || (!ToEOF && Res != (ssize_t) n)) // error, or short read
+	 return false;
       if (ToEOF && Res == 0) // EOF
-         break;
+	 break;
       Size -= Res;
-      MD5.Add(Buf,Res);
-      SHA1.Add(Buf,Res);
-      SHA256.Add(Buf,Res);
+      if (addMD5 == true)
+	 MD5.Add(Buf,Res);
+      if (addSHA1 == true)
+	 SHA1.Add(Buf,Res);
+      if (addSHA256 == true)
+	 SHA256.Add(Buf,Res);
+      if (addSHA512 == true)
+	 SHA512.Add(Buf,Res);
+   }
+   return true;
+}
+bool Hashes::AddFD(FileFd &Fd,unsigned long long Size, bool const addMD5,
+		   bool const addSHA1, bool const addSHA256, bool const addSHA512)
+{
+   unsigned char Buf[64*64];
+   bool const ToEOF = (Size == 0);
+   while (Size != 0 || ToEOF)
+   {
+      unsigned long long n = sizeof(Buf);
+      if (!ToEOF) n = std::min(Size, n);
+      unsigned long long a = 0;
+      if (Fd.Read(Buf, n, &a) == false) // error
+	 return false;
+      if (ToEOF == false)
+      {
+	 if (a != n) // short read
+	    return false;
+      }
+      else if (a == 0) // EOF
+	 break;
+      Size -= a;
+      if (addMD5 == true)
+	 MD5.Add(Buf, a);
+      if (addSHA1 == true)
+	 SHA1.Add(Buf, a);
+      if (addSHA256 == true)
+	 SHA256.Add(Buf, a);
+      if (addSHA512 == true)
+	 SHA512.Add(Buf, a);
    }
    return true;
 }
 									/*}}}*/
-
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 264f7fe90..0c0b6c6a7 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -16,37 +16,41 @@
 
 #include <apt-pkg/md5.h>
 #include <apt-pkg/sha1.h>
-#include <apt-pkg/sha256.h>
+#include <apt-pkg/sha2.h>
+#include <apt-pkg/fileutl.h>
 
 #include <algorithm>
 #include <vector>
 #include <cstring>
 
+
+#ifndef APT_8_CLEANER_HEADERS
 using std::min;
 using std::vector;
+#endif
 
 // helper class that contains hash function name
 // and hash
 class HashString
 {
  protected:
-   string Type;
-   string Hash;
+   std::string Type;
+   std::string Hash;
    static const char * _SupportedHashes[10];
 
  public:
-   HashString(string Type, string Hash);
-   HashString(string StringedHashString);  // init from str as "type:hash"
+   HashString(std::string Type, std::string Hash);
+   HashString(std::string StringedHashString);  // init from str as "type:hash"
    HashString();
 
    // get hash type used
-   string HashType() { return Type; };
+   std::string HashType() { return Type; };
 
    // verify the given filename against the currently loaded hash
-   bool VerifyFile(string filename) const;
+   bool VerifyFile(std::string filename) const;
 
    // helper
-   string toStr() const;                    // convert to str as "type:hash"
+   std::string toStr() const;                    // convert to str as "type:hash"
    bool empty() const;
 
    // return the list of hashes we support
@@ -60,13 +64,21 @@ class Hashes
    MD5Summation MD5;
    SHA1Summation SHA1;
    SHA256Summation SHA256;
+   SHA512Summation SHA512;
    
-   inline bool Add(const unsigned char *Data,unsigned long Size)
+   inline bool Add(const unsigned char *Data,unsigned long long Size)
    {
-      return MD5.Add(Data,Size) && SHA1.Add(Data,Size) && SHA256.Add(Data,Size);
+      return MD5.Add(Data,Size) && SHA1.Add(Data,Size) && SHA256.Add(Data,Size) && SHA512.Add(Data,Size);
    };
    inline bool Add(const char *Data) {return Add((unsigned char *)Data,strlen(Data));};
-   bool AddFD(int Fd,unsigned long Size);
+   inline bool AddFD(int const Fd,unsigned long long Size = 0)
+   { return AddFD(Fd, Size, true, true, true, true); };
+   bool AddFD(int const Fd, unsigned long long Size, bool const addMD5,
+	      bool const addSHA1, bool const addSHA256, bool const addSHA512);
+   inline bool AddFD(FileFd &Fd,unsigned long long Size = 0)
+   { return AddFD(Fd, Size, true, true, true, true); };
+   bool AddFD(FileFd &Fd, unsigned long long Size, bool const addMD5,
+	      bool const addSHA1, bool const addSHA256, bool const addSHA512);
    inline bool Add(const unsigned char *Beg,const unsigned char *End) 
                   {return Add(Beg,End-Beg);};
 };
diff --git a/apt-pkg/contrib/hashsum.cc b/apt-pkg/contrib/hashsum.cc
new file mode 100644
index 000000000..289e43aa4
--- /dev/null
+++ b/apt-pkg/contrib/hashsum.cc
@@ -0,0 +1,50 @@
+// Cryptographic API Base
+#include <config.h>
+
+#include <unistd.h>
+#include "hashsum_template.h"
+
+// Summation::AddFD - Add content of file into the checksum		/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool SummationImplementation::AddFD(int const Fd, unsigned long long Size) {
+   unsigned char Buf[64 * 64];
+   ssize_t Res = 0;
+   int ToEOF = (Size == 0);
+   while (Size != 0 || ToEOF)
+   {
+      unsigned long long n = sizeof(Buf);
+      if (!ToEOF) n = std::min(Size, n);
+      Res = read(Fd, Buf, n);
+      if (Res < 0 || (!ToEOF && Res != (ssize_t) n)) // error, or short read
+	 return false;
+      if (ToEOF && Res == 0) // EOF
+	 break;
+      Size -= Res;
+      Add(Buf,Res);
+   }
+   return true;
+}
+bool SummationImplementation::AddFD(FileFd &Fd, unsigned long long Size) {
+   unsigned char Buf[64 * 64];
+   bool ToEOF = (Size == 0);
+   while (Size != 0 || ToEOF)
+   {
+      unsigned long long n = sizeof(Buf);
+      if (!ToEOF) n = std::min(Size, n);
+      unsigned long long a = 0;
+      if (Fd.Read(Buf, n, &a) == false) // error
+	 return false;
+      if (ToEOF == false)
+      {
+	 if (a != n) // short read
+	    return false;
+      }
+      else if (a == 0) // EOF
+	 break;
+      Size -= a;
+      Add(Buf, a);
+   }
+   return true;
+}
+									/*}}}*/
diff --git a/apt-pkg/contrib/hashsum_template.h b/apt-pkg/contrib/hashsum_template.h
new file mode 100644
index 000000000..9bf160b2b
--- /dev/null
+++ b/apt-pkg/contrib/hashsum_template.h
@@ -0,0 +1,118 @@
+// -*- mode: cpp; mode: fold -*-
+// Description                                                          /*{{{*/
+// $Id: hashsum_template.h,v 1.3 2001/05/07 05:05:47 jgg Exp $
+/* ######################################################################
+
+   HashSumValueTemplate - Generic Storage for a hash value
+   
+   ##################################################################### */
+                                                                        /*}}}*/
+#ifndef APTPKG_HASHSUM_TEMPLATE_H
+#define APTPKG_HASHSUM_TEMPLATE_H
+
+#include <apt-pkg/fileutl.h>
+
+#include <string>
+#include <cstring>
+#include <algorithm>
+#include <stdint.h>
+
+#include <apt-pkg/strutl.h>
+
+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+using std::min;
+#endif
+
+template<int N>
+class HashSumValue
+{
+   unsigned char Sum[N/8];
+   
+   public:
+
+   // Accessors
+   bool operator ==(const HashSumValue &rhs) const
+   {
+      return memcmp(Sum,rhs.Sum,sizeof(Sum)) == 0;
+   };
+   bool operator !=(const HashSumValue &rhs) const
+   {
+      return memcmp(Sum,rhs.Sum,sizeof(Sum)) != 0;
+   };
+
+   std::string Value() const
+   {
+      char Conv[16] =
+      { '0','1','2','3','4','5','6','7','8','9','a','b',
+        'c','d','e','f'
+      };
+      char Result[((N/8)*2)+1];
+      Result[(N/8)*2] = 0;
+      
+      // Convert each char into two letters
+      int J = 0;
+      int I = 0;
+      for (; I != (N/8)*2; J++,I += 2)
+      {
+         Result[I] = Conv[Sum[J] >> 4];
+         Result[I + 1] = Conv[Sum[J] & 0xF];
+      }
+      return std::string(Result);
+   };
+   
+   inline void Value(unsigned char S[N/8])
+   {
+      for (int I = 0; I != sizeof(Sum); I++) 
+         S[I] = Sum[I];
+   };
+
+   inline operator std::string() const 
+   {
+      return Value();
+   };
+
+   bool Set(std::string Str) 
+   {
+      return Hex2Num(Str,Sum,sizeof(Sum));
+   };
+
+   inline void Set(unsigned char S[N/8]) 
+   {
+      for (int I = 0; I != sizeof(Sum); I++) 
+         Sum[I] = S[I];
+   };
+
+   HashSumValue(std::string Str) 
+   {
+         memset(Sum,0,sizeof(Sum));
+         Set(Str);
+   }
+   HashSumValue()
+   {
+      memset(Sum,0,sizeof(Sum));
+   }
+};
+
+class SummationImplementation
+{
+   public:
+   virtual bool Add(const unsigned char *inbuf, unsigned long long inlen) = 0;
+   inline bool Add(const char *inbuf, unsigned long long const inlen)
+   { return Add((unsigned char *)inbuf, inlen); };
+
+   inline bool Add(const unsigned char *Data)
+   { return Add(Data, strlen((const char *)Data)); };
+   inline bool Add(const char *Data)
+   { return Add((const unsigned char *)Data, strlen((const char *)Data)); };
+
+   inline bool Add(const unsigned char *Beg, const unsigned char *End)
+   { return Add(Beg, End - Beg); };
+   inline bool Add(const char *Beg, const char *End)
+   { return Add((const unsigned char *)Beg, End - Beg); };
+
+   bool AddFD(int Fd, unsigned long long Size = 0);
+   bool AddFD(FileFd &Fd, unsigned long long Size = 0);
+};
+
+#endif
diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index c0fa8493d..4351aeb22 100644
--- a/apt-pkg/contrib/md5.cc
+++ b/apt-pkg/contrib/md5.cc
@@ -35,6 +35,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/md5.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/macros.h>
@@ -43,7 +45,6 @@
 #include <unistd.h>
 #include <netinet/in.h>                          // For htonl
 #include <inttypes.h>
-#include <config.h>
 									/*}}}*/
 
 // byteSwap - Swap bytes in a buffer					/*{{{*/
@@ -165,61 +166,6 @@ static void MD5Transform(uint32_t buf[4], uint32_t const in[16])
    buf[3] += d;
 }
 									/*}}}*/
-// MD5SumValue::MD5SumValue - Constructs the summation from a string	/*{{{*/
-// ---------------------------------------------------------------------
-/* The string form of a MD5 is a 32 character hex number */
-MD5SumValue::MD5SumValue(string Str)
-{
-   memset(Sum,0,sizeof(Sum));
-   Set(Str);
-}
-									/*}}}*/
-// MD5SumValue::MD5SumValue - Default constructor			/*{{{*/
-// ---------------------------------------------------------------------
-/* Sets the value to 0 */
-MD5SumValue::MD5SumValue()
-{
-   memset(Sum,0,sizeof(Sum));
-}
-									/*}}}*/
-// MD5SumValue::Set - Set the sum from a string				/*{{{*/
-// ---------------------------------------------------------------------
-/* Converts the hex string into a set of chars */
-bool MD5SumValue::Set(string Str)
-{
-   return Hex2Num(Str,Sum,sizeof(Sum));
-}
-									/*}}}*/
-// MD5SumValue::Value - Convert the number into a string		/*{{{*/
-// ---------------------------------------------------------------------
-/* Converts the set of chars into a hex string in lower case */
-string MD5SumValue::Value() const
-{
-   char Conv[16] = {'0','1','2','3','4','5','6','7','8','9','a','b',
-                    'c','d','e','f'};
-   char Result[33];
-   Result[32] = 0;
-   
-   // Convert each char into two letters
-   int J = 0;
-   int I = 0;
-   for (; I != 32; J++, I += 2)
-   {
-      Result[I] = Conv[Sum[J] >> 4];
-      Result[I + 1] = Conv[Sum[J] & 0xF];
-   } 
-
-   return string(Result);
-}
-									/*}}}*/
-// MD5SumValue::operator == - Comparitor				/*{{{*/
-// ---------------------------------------------------------------------
-/* Call memcmp on the buffer */
-bool MD5SumValue::operator ==(const MD5SumValue &rhs) const
-{
-   return memcmp(Sum,rhs.Sum,sizeof(Sum)) == 0;
-}
-									/*}}}*/
 // MD5Summation::MD5Summation - Initialize the summer			/*{{{*/
 // ---------------------------------------------------------------------
 /* This assigns the deep magic initial values */
@@ -241,7 +187,7 @@ MD5Summation::MD5Summation()
 // MD5Summation::Add - 'Add' a data set to the hash			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool MD5Summation::Add(const unsigned char *data,unsigned long len)
+bool MD5Summation::Add(const unsigned char *data,unsigned long long len)
 {
    if (Done == true)
       return false;
@@ -286,29 +232,6 @@ bool MD5Summation::Add(const unsigned char *data,unsigned long len)
    return true;   
 }
 									/*}}}*/
-// MD5Summation::AddFD - Add the contents of a FD to the hash		/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool MD5Summation::AddFD(int Fd,unsigned long Size)
-{
-   unsigned char Buf[64*64];
-   int Res = 0;
-   int ToEOF = (Size == 0);
-   while (Size != 0 || ToEOF)
-   {
-      unsigned n = sizeof(Buf);
-      if (!ToEOF) n = min(Size,(unsigned long)n);
-      Res = read(Fd,Buf,n);
-      if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read
-         return false;
-      if (ToEOF && Res == 0) // EOF
-         break;
-      Size -= Res;
-      Add(Buf,Res);
-   }
-   return true;
-}
-									/*}}}*/
 // MD5Summation::Result - Returns the value of the sum			/*{{{*/
 // ---------------------------------------------------------------------
 /* Because this must add in the last bytes of the series it prevents anyone
@@ -353,7 +276,7 @@ MD5SumValue MD5Summation::Result()
    }
    
    MD5SumValue V;
-   memcpy(V.Sum,buf,16);
+   V.Set((unsigned char *)buf);
    return V;
 }
 									/*}}}*/
diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 96c8975b4..25631b166 100644
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -29,48 +29,29 @@
 #include <algorithm>
 #include <stdint.h>
 
+#include "hashsum_template.h"
+
+#ifndef APT_8_CLEANER_HEADERS
 using std::string;
 using std::min;
+#endif
 
-class MD5Summation;
-
-class MD5SumValue
-{
-   friend class MD5Summation;
-   unsigned char Sum[4*4];
-   
-   public:
-
-   // Accessors
-   bool operator ==(const MD5SumValue &rhs) const; 
-   string Value() const;
-   inline void Value(unsigned char S[16]) 
-         {for (int I = 0; I != sizeof(Sum); I++) S[I] = Sum[I];};
-   inline operator string() const {return Value();};
-   bool Set(string Str);
-   inline void Set(unsigned char S[16]) 
-         {for (int I = 0; I != sizeof(Sum); I++) Sum[I] = S[I];};
-
-   MD5SumValue(string Str);
-   MD5SumValue();
-};
+typedef HashSumValue<128> MD5SumValue;
 
-class MD5Summation
+class MD5Summation : public SummationImplementation
 {
    uint32_t Buf[4];
    unsigned char Bytes[2*4];
    unsigned char In[16*4];
    bool Done;
-   
+
    public:
 
-   bool Add(const unsigned char *Data,unsigned long Size);
-   inline bool Add(const char *Data) {return Add((unsigned char *)Data,strlen(Data));};
-   bool AddFD(int Fd,unsigned long Size);
-   inline bool Add(const unsigned char *Beg,const unsigned char *End) 
-                  {return Add(Beg,End-Beg);};
+   bool Add(const unsigned char *inbuf, unsigned long long inlen);
+   using SummationImplementation::Add;
+
    MD5SumValue Result();
-   
+
    MD5Summation();
 };
 
diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 19381ae47..160718ea5 100644
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -17,10 +17,11 @@
 									/*}}}*/
 // Include Files							/*{{{*/
 #define _BSD_SOURCE
+#include <config.h>
+
 #include <apt-pkg/mmap.h>
 #include <apt-pkg/error.h>
-
-#include <apti18n.h>
+#include <apt-pkg/fileutl.h>
 
 #include <sys/mman.h>
 #include <sys/stat.h>
@@ -28,9 +29,10 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <errno.h>
-
 #include <cstring>
-   									/*}}}*/
+
+#include <apti18n.h>
+									/*}}}*/
 
 // MMap::MMap - Constructor						/*{{{*/
 // ---------------------------------------------------------------------
@@ -64,7 +66,7 @@ MMap::~MMap()
 bool MMap::Map(FileFd &Fd)
 {
    iSize = Fd.Size();
-   
+
    // Set the permissions.
    int Prot = PROT_READ;
    int Map = MAP_SHARED;
@@ -75,7 +77,18 @@ bool MMap::Map(FileFd &Fd)
    
    if (iSize == 0)
       return _error->Error(_("Can't mmap an empty file"));
-   
+
+   // We can't mmap compressed fd's directly, so we need to read it completely
+   if (Fd.IsCompressed() == true)
+   {
+      if ((Flags & ReadOnly) != ReadOnly)
+	 return _error->Error("Compressed file %s can only be mapped readonly", Fd.Name().c_str());
+      Base = new unsigned char[iSize];
+      if (Fd.Seek(0L) == false || Fd.Read(Base, iSize) == false)
+	 return _error->Error("Compressed file %s can't be read into mmap", Fd.Name().c_str());
+      return true;
+   }
+
    // Map it.
    Base = mmap(0,iSize,Prot,Map,Fd.Fd(),0);
    if (Base == (void *)-1)
@@ -84,6 +97,13 @@ bool MMap::Map(FileFd &Fd)
       {
 	 // The filesystem doesn't support this particular kind of mmap.
 	 // So we allocate a buffer and read the whole file into it.
+	 if ((Flags & ReadOnly) == ReadOnly)
+	 {
+	    // for readonly, we don't need sync, so make it simple
+	    Base = new unsigned char[iSize];
+	    return Fd.Read(Base, iSize);
+	 }
+	 // FIXME: Writing to compressed fd's ?
 	 int const dupped_fd = dup(Fd.Fd());
 	 if (dupped_fd == -1)
 	    return _error->Errno("mmap", _("Couldn't duplicate file descriptor %i"), Fd.Fd());
@@ -94,7 +114,7 @@ bool MMap::Map(FileFd &Fd)
 	    return false;
       }
       else
-	 return _error->Errno("mmap",_("Couldn't make mmap of %lu bytes"),
+	 return _error->Errno("mmap",_("Couldn't make mmap of %llu bytes"),
 	                      iSize);
      }
 
@@ -165,7 +185,7 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop)
       return true;
    
 #ifdef _POSIX_SYNCHRONIZED_IO
-   unsigned long PSize = sysconf(_SC_PAGESIZE);
+   unsigned long long PSize = sysconf(_SC_PAGESIZE);
    if ((Flags & ReadOnly) != ReadOnly)
    {
       if (SyncToFd != 0)
@@ -176,7 +196,7 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop)
       }
       else
       {
-	 if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0)
+	 if (msync((char *)Base+(unsigned long long)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0)
 	    return _error->Errno("msync", _("Unable to synchronize mmap"));
       }
    }
@@ -196,7 +216,7 @@ DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long const &Work
    if (_error->PendingError() == true)
       return;
    
-   unsigned long EndOfFile = Fd->Size();
+   unsigned long long EndOfFile = Fd->Size();
    if (EndOfFile > WorkSpace)
       WorkSpace = EndOfFile;
    else if(WorkSpace > 0)
@@ -284,7 +304,7 @@ DynamicMMap::~DynamicMMap()
       return;
    }
    
-   unsigned long EndOfFile = iSize;
+   unsigned long long EndOfFile = iSize;
    iSize = WorkSpace;
    Close(false);
    if(ftruncate(Fd->Fd(),EndOfFile) < 0)
@@ -294,9 +314,9 @@ DynamicMMap::~DynamicMMap()
 // DynamicMMap::RawAllocate - Allocate a raw chunk of unaligned space	/*{{{*/
 // ---------------------------------------------------------------------
 /* This allocates a block of memory aligned to the given size */
-unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln)
+unsigned long DynamicMMap::RawAllocate(unsigned long long Size,unsigned long Aln)
 {
-   unsigned long Result = iSize;
+   unsigned long long Result = iSize;
    if (Aln != 0)
       Result += Aln - (iSize%Aln);
 
@@ -411,7 +431,7 @@ bool DynamicMMap::Grow() {
 	if (GrowFactor <= 0)
 		return _error->Error(_("Unable to increase size of the MMap as automatic growing is disabled by user."));
 
-	unsigned long const newSize = WorkSpace + GrowFactor;
+	unsigned long long const newSize = WorkSpace + GrowFactor;
 
 	if(Fd != 0) {
 		Fd->Seek(newSize - 1);
diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h
index 2bf2c1540..6bd4a2d86 100644
--- a/apt-pkg/contrib/mmap.h
+++ b/apt-pkg/contrib/mmap.h
@@ -27,9 +27,13 @@
 
 
 #include <string>
-#include <apt-pkg/fileutl.h>
 
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/fileutl.h>
 using std::string;
+#endif
+
+class FileFd;
 
 /* This should be a 32 bit type, larger tyes use too much ram and smaller
    types are too small. Where ever possible 'unsigned long' should be used
@@ -41,7 +45,7 @@ class MMap
    protected:
    
    unsigned long Flags;
-   unsigned long iSize;
+   unsigned long long iSize;
    void *Base;
 
    // In case mmap can not be used, we keep a dup of the file
@@ -60,8 +64,8 @@ class MMap
    // Simple accessors
    inline operator void *() {return Base;};
    inline void *Data() {return Base;}; 
-   inline unsigned long Size() {return iSize;};
-   inline void AddSize(unsigned long const size) {iSize += size;};
+   inline unsigned long long Size() {return iSize;};
+   inline void AddSize(unsigned long long const size) {iSize += size;};
    inline bool validData() const { return Base != (void *)-1 && Base != 0; };
    
    // File manipulators
@@ -99,10 +103,10 @@ class DynamicMMap : public MMap
    public:
 
    // Allocation
-   unsigned long RawAllocate(unsigned long Size,unsigned long Aln = 0);
+   unsigned long RawAllocate(unsigned long long Size,unsigned long Aln = 0);
    unsigned long Allocate(unsigned long ItemSize);
    unsigned long WriteString(const char *String,unsigned long Len = (unsigned long)-1);
-   inline unsigned long WriteString(const string &S) {return WriteString(S.c_str(),S.length());};
+   inline unsigned long WriteString(const std::string &S) {return WriteString(S.c_str(),S.length());};
    void UsePools(Pool &P,unsigned int Count) {Pools = &P; PoolCount = Count;};
    
    DynamicMMap(FileFd &F,unsigned long Flags,unsigned long const &WorkSpace = 2*1024*1024,
diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc
index 9ff5796c5..56e59d84b 100644
--- a/apt-pkg/contrib/netrc.cc
+++ b/apt-pkg/contrib/netrc.cc
@@ -11,9 +11,12 @@
 
    ##################################################################### */
 									/*}}}*/
+#include <config.h>
 
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
+
 #include <iostream>
 #include <stdio.h>
 #include <stdlib.h>
@@ -23,6 +26,7 @@
 
 #include "netrc.h"
 
+using std::string;
 
 /* Get user and password from .netrc when given a machine name */
 
@@ -64,8 +68,7 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
     if (!home)
       return -1;
 
-    asprintf (&netrcfile, "%s%s%s", home, DIR_CHAR, NETRC);
-    if(!netrcfile)
+    if (asprintf (&netrcfile, "%s%s%s", home, DIR_CHAR, NETRC) == -1 || netrcfile == NULL)
       return -1;
     else
       netrc_alloc = true;
diff --git a/apt-pkg/contrib/netrc.h b/apt-pkg/contrib/netrc.h
index 02a5eb09f..5931d4a42 100644
--- a/apt-pkg/contrib/netrc.h
+++ b/apt-pkg/contrib/netrc.h
@@ -14,16 +14,22 @@
 #ifndef NETRC_H
 #define NETRC_H
 
+#include <string>
+
+#ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/strutl.h>
+#endif
 
 #define DOT_CHAR "."
 #define DIR_CHAR "/"
 
+class URI;
+
 // Assume: password[0]=0, host[0] != 0.
 // If login[0] = 0, search for login and password within a machine section
 // in the netrc.
 // If login[0] != 0, search for password within machine and login.
 int parsenetrc (char *host, char *login, char *password, char *filename);
 
-void maybe_add_auth (URI &Uri, string NetRCFile);
+void maybe_add_auth (URI &Uri, std::string NetRCFile);
 #endif
diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 45e81edcb..317048845 100644
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -8,15 +8,17 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/progress.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 
-#include <apti18n.h>
-
 #include <iostream>
 #include <stdio.h>
 #include <cstring>
+
+#include <apti18n.h>
 									/*}}}*/
 
 using namespace std;
@@ -35,7 +37,7 @@ OpProgress::OpProgress() : Current(0), Total(0), Size(0), SubTotal(1),
 /* Current is the Base Overall progress in units of Total. Cur is the sub
    progress in units of SubTotal. Size is a scaling factor that says what
    percent of Total SubTotal is. */
-void OpProgress::Progress(unsigned long Cur)
+void OpProgress::Progress(unsigned long long Cur)
 {
    if (Total == 0 || Size == 0 || SubTotal == 0)
       Percent = 0;
@@ -47,8 +49,8 @@ void OpProgress::Progress(unsigned long Cur)
 // OpProgress::OverallProgress - Set the overall progress		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void OpProgress::OverallProgress(unsigned long Current, unsigned long Total,
-	  			 unsigned long Size,const string &Op)
+void OpProgress::OverallProgress(unsigned long long Current, unsigned long long Total,
+	  			 unsigned long long Size,const string &Op)
 {
    this->Current = Current;
    this->Total = Total;
@@ -65,27 +67,18 @@ void OpProgress::OverallProgress(unsigned long Current, unsigned long Total,
 // OpProgress::SubProgress - Set the sub progress state			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void OpProgress::SubProgress(unsigned long SubTotal,const string &Op)
-{
-   this->SubTotal = SubTotal;
-   SubOp = Op;
-   if (Total == 0)
-      Percent = 0;
-   else
-      Percent = Current*100.0/Total;
-   Update();
-}
-									/*}}}*/
-// OpProgress::SubProgress - Set the sub progress state			/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-void OpProgress::SubProgress(unsigned long SubTotal)
+void OpProgress::SubProgress(unsigned long long SubTotal,const string &Op,
+			     float const Percent)
 {
    this->SubTotal = SubTotal;
-   if (Total == 0)
-      Percent = 0;
+   if (Op.empty() == false)
+      SubOp = Op;
+   if (Total == 0 || Percent == 0)
+      this->Percent = 0;
+   else if (Percent != -1)
+      this->Percent = this->Current += (Size*Percent)/SubTotal;
    else
-      Percent = Current*100.0/Total;
+      this->Percent = Current*100.0/Total;
    Update();
 }
 									/*}}}*/
diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h
index 7dd004f7e..3a6943aee 100644
--- a/apt-pkg/contrib/progress.h
+++ b/apt-pkg/contrib/progress.h
@@ -25,26 +25,28 @@
 #include <string>
 #include <sys/time.h>
 
+#ifndef APT_8_CLEANER_HEADERS
 using std::string;
+#endif
 
 class Configuration;
 class OpProgress
 {
-   unsigned long Current;
-   unsigned long Total;
-   unsigned long Size;
-   unsigned long SubTotal;
+   unsigned long long Current;
+   unsigned long long Total;
+   unsigned long long Size;
+   unsigned long long SubTotal;
    float LastPercent;
    
    // Change reduction code
    struct timeval LastTime;
-   string LastOp;
-   string LastSubOp;
+   std::string LastOp;
+   std::string LastSubOp;
    
    protected:
    
-   string Op;
-   string SubOp;
+   std::string Op;
+   std::string SubOp;
    float Percent;
    
    bool MajorChange;
@@ -54,11 +56,10 @@ class OpProgress
    
    public:
    
-   void Progress(unsigned long Current);
-   void SubProgress(unsigned long SubTotal);
-   void SubProgress(unsigned long SubTotal,const string &Op);
-   void OverallProgress(unsigned long Current,unsigned long Total,
-			unsigned long Size,const string &Op);
+   void Progress(unsigned long long Current);
+   void SubProgress(unsigned long long SubTotal, const std::string &Op = "", float const Percent = -1);
+   void OverallProgress(unsigned long long Current,unsigned long long Total,
+			unsigned long long Size,const std::string &Op);
    virtual void Done() {};
    
    OpProgress();
@@ -68,8 +69,8 @@ class OpProgress
 class OpTextProgress : public OpProgress
 {
    protected:
-   
-   string OldOp;
+
+   std::string OldOp;
    bool NoUpdate;
    bool NoDisplay;
    unsigned long LastLen;
diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc
index abc2aaf9f..b5a6a2440 100644
--- a/apt-pkg/contrib/sha1.cc
+++ b/apt-pkg/contrib/sha1.cc
@@ -29,6 +29,8 @@
  */
 									/*}}} */
 // Include Files                                                        /*{{{*/
+#include <config.h>
+
 #include <apt-pkg/sha1.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/macros.h>
@@ -36,7 +38,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <inttypes.h>
-#include <config.h>
 									/*}}}*/
 
 // SHA1Transform - Alters an existing SHA-1 hash			/*{{{*/
@@ -177,67 +178,6 @@ static void SHA1Transform(uint32_t state[5],uint8_t const buffer[64])
 }
 									/*}}}*/
 
-// SHA1SumValue::SHA1SumValue - Constructs the summation from a string  /*{{{*/
-// ---------------------------------------------------------------------
-/* The string form of a SHA1 is a 40 character hex number */
-SHA1SumValue::SHA1SumValue(string Str)
-{
-   memset(Sum,0,sizeof(Sum));
-   Set(Str);
-}
-
-									/*}}} */
-// SHA1SumValue::SHA1SumValue - Default constructor                     /*{{{*/
-// ---------------------------------------------------------------------
-/* Sets the value to 0 */
-SHA1SumValue::SHA1SumValue()
-{
-   memset(Sum,0,sizeof(Sum));
-}
-
-									/*}}} */
-// SHA1SumValue::Set - Set the sum from a string                        /*{{{*/
-// ---------------------------------------------------------------------
-/* Converts the hex string into a set of chars */
-bool SHA1SumValue::Set(string Str)
-{
-   return Hex2Num(Str,Sum,sizeof(Sum));
-}
-
-									/*}}} */
-// SHA1SumValue::Value - Convert the number into a string               /*{{{*/
-// ---------------------------------------------------------------------
-/* Converts the set of chars into a hex string in lower case */
-string SHA1SumValue::Value() const
-{
-   char Conv[16] =
-      { '0','1','2','3','4','5','6','7','8','9','a','b',
-      'c','d','e','f'
-   };
-   char Result[41];
-   Result[40] = 0;
-
-   // Convert each char into two letters
-   int J = 0;
-   int I = 0;
-   for (; I != 40; J++,I += 2)
-   {
-      Result[I] = Conv[Sum[J] >> 4];
-      Result[I + 1] = Conv[Sum[J] & 0xF];
-   }
-
-   return string(Result);
-}
-
-									/*}}} */
-// SHA1SumValue::operator == - Comparator                               /*{{{*/
-// ---------------------------------------------------------------------
-/* Call memcmp on the buffer */
-bool SHA1SumValue::operator == (const SHA1SumValue & rhs) const
-{
-   return memcmp(Sum,rhs.Sum,sizeof(Sum)) == 0;
-}
-									/*}}}*/
 // SHA1Summation::SHA1Summation - Constructor                           /*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -289,18 +229,20 @@ SHA1SumValue SHA1Summation::Result()
 
    // Transfer over the result
    SHA1SumValue Value;
+   unsigned char res[20];
    for (unsigned i = 0; i < 20; i++)
    {
-      Value.Sum[i] = (unsigned char)
+      res[i] = (unsigned char)
 	 ((state[i >> 2] >> ((3 - (i & 3)) * 8)) & 255);
    }
+   Value.Set(res);
    return Value;
 }
 									/*}}}*/
 // SHA1Summation::Add - Adds content of buffer into the checksum        /*{{{*/
 // ---------------------------------------------------------------------
 /* May not be called after Result() is called */
-bool SHA1Summation::Add(const unsigned char *data,unsigned long len)
+bool SHA1Summation::Add(const unsigned char *data,unsigned long long len)
 {
    if (Done)
       return false;
@@ -331,26 +273,3 @@ bool SHA1Summation::Add(const unsigned char *data,unsigned long len)
    return true;
 }
 									/*}}}*/
-// SHA1Summation::AddFD - Add content of file into the checksum         /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool SHA1Summation::AddFD(int Fd,unsigned long Size)
-{
-   unsigned char Buf[64 * 64];
-   int Res = 0;
-   int ToEOF = (Size == 0);
-   while (Size != 0 || ToEOF)
-   {
-      unsigned n = sizeof(Buf);
-      if (!ToEOF) n = min(Size,(unsigned long)n);
-      Res = read(Fd,Buf,n);
-      if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read
-	 return false;
-      if (ToEOF && Res == 0) // EOF
-         break;
-      Size -= Res;
-      Add(Buf,Res);
-   }
-   return true;
-}
-									/*}}}*/
diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
index 8ddd889f1..a8d55eb13 100644
--- a/apt-pkg/contrib/sha1.h
+++ b/apt-pkg/contrib/sha1.h
@@ -18,33 +18,16 @@
 #include <cstring>
 #include <algorithm>
 
+#include "hashsum_template.h"
+
+#ifndef APT_8_CLEANER_HEADERS
 using std::string;
 using std::min;
+#endif
 
-class SHA1Summation;
-
-class SHA1SumValue
-{
-   friend class SHA1Summation;
-   unsigned char Sum[20];
-   
-   public:
-
-   // Accessors
-   bool operator ==(const SHA1SumValue &rhs) const; 
-   string Value() const;
-   inline void Value(unsigned char S[20])
-         {for (int I = 0; I != sizeof(Sum); I++) S[I] = Sum[I];};
-   inline operator string() const {return Value();};
-   bool Set(string Str);
-   inline void Set(unsigned char S[20]) 
-         {for (int I = 0; I != sizeof(Sum); I++) Sum[I] = S[I];};
-
-   SHA1SumValue(string Str);
-   SHA1SumValue();
-};
+typedef  HashSumValue<160> SHA1SumValue;
 
-class SHA1Summation
+class SHA1Summation : public SummationImplementation
 {
    /* assumes 64-bit alignment just in case */
    unsigned char Buffer[64] __attribute__((aligned(8)));
@@ -53,12 +36,9 @@ class SHA1Summation
    bool Done;
    
    public:
+   bool Add(const unsigned char *inbuf, unsigned long long inlen);
+   using SummationImplementation::Add;
 
-   bool Add(const unsigned char *inbuf,unsigned long inlen);
-   inline bool Add(const char *Data) {return Add((unsigned char *)Data,strlen(Data));};
-   bool AddFD(int Fd,unsigned long Size);
-   inline bool Add(const unsigned char *Beg,const unsigned char *End) 
-                  {return Add(Beg,End-Beg);};
    SHA1SumValue Result();
    
    SHA1Summation();
diff --git a/apt-pkg/contrib/sha2.h b/apt-pkg/contrib/sha2.h
new file mode 100644
index 000000000..51c921dbd
--- /dev/null
+++ b/apt-pkg/contrib/sha2.h
@@ -0,0 +1,103 @@
+// -*- mode: cpp; mode: fold -*-
+// Description                                                          /*{{{*/
+// $Id: sha512.h,v 1.3 2001/05/07 05:05:47 jgg Exp $
+/* ######################################################################
+
+   SHA{512,256}SumValue - Storage for a SHA-{512,256} hash.
+   SHA{512,256}Summation - SHA-{512,256} Secure Hash Algorithm.
+   
+   This is a C++ interface to a set of SHA{512,256}Sum functions, that mirrors
+   the equivalent MD5 & SHA1 classes. 
+
+   ##################################################################### */
+                                                                        /*}}}*/
+#ifndef APTPKG_SHA2_H
+#define APTPKG_SHA2_H
+
+#include <string>
+#include <cstring>
+#include <algorithm>
+#include <stdint.h>
+
+#include "sha2_internal.h"
+#include "hashsum_template.h"
+
+typedef HashSumValue<512> SHA512SumValue;
+typedef HashSumValue<256> SHA256SumValue;
+
+class SHA2SummationBase : public SummationImplementation
+{
+ protected:
+   bool Done;
+ public:
+   bool Add(const unsigned char *inbuf, unsigned long long len) = 0;
+
+   void Result();
+};
+
+class SHA256Summation : public SHA2SummationBase
+{
+   SHA256_CTX ctx;
+   unsigned char Sum[32];
+
+   public:
+   bool Add(const unsigned char *inbuf, unsigned long long len)
+   {
+      if (Done) 
+         return false;
+      SHA256_Update(&ctx, inbuf, len);
+      return true;
+   };
+   using SummationImplementation::Add;
+
+   SHA256SumValue Result()
+   {
+      if (!Done) {
+         SHA256_Final(Sum, &ctx);
+         Done = true;
+      }
+      SHA256SumValue res;
+      res.Set(Sum);
+      return res;
+   };
+   SHA256Summation() 
+   {
+      SHA256_Init(&ctx);
+      Done = false;
+   };
+};
+
+class SHA512Summation : public SHA2SummationBase
+{
+   SHA512_CTX ctx;
+   unsigned char Sum[64];
+
+   public:
+   bool Add(const unsigned char *inbuf, unsigned long long len)
+   {
+      if (Done) 
+         return false;
+      SHA512_Update(&ctx, inbuf, len);
+      return true;
+   };
+   using SummationImplementation::Add;
+
+   SHA512SumValue Result()
+   {
+      if (!Done) {
+         SHA512_Final(Sum, &ctx);
+         Done = true;
+      }
+      SHA512SumValue res;
+      res.Set(Sum);
+      return res;
+   };
+   SHA512Summation()
+   {
+      SHA512_Init(&ctx);
+      Done = false;
+   };
+};
+
+
+#endif
diff --git a/apt-pkg/contrib/sha256.cc b/apt-pkg/contrib/sha256.cc
deleted file mode 100644
index e380c13ae..000000000
--- a/apt-pkg/contrib/sha256.cc
+++ /dev/null
@@ -1,424 +0,0 @@
-/*
- * Cryptographic API.							{{{
- *
- * SHA-256, as specified in
- * http://csrc.nist.gov/cryptval/shs/sha256-384-512.pdf
- *
- * SHA-256 code by Jean-Luc Cooke <jlcooke@certainkey.com>.
- *
- * Copyright (c) Jean-Luc Cooke <jlcooke@certainkey.com>
- * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
- * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
- *
- * Ported from the Linux kernel to Apt by Anthony Towns <ajt@debian.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option) 
- * any later version.
- *
- */									/*}}}*/
-
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/sha256.h"
-#endif
-
-
-#define SHA256_DIGEST_SIZE      32
-#define SHA256_HMAC_BLOCK_SIZE  64
-
-#define ror32(value,bits) (((value) >> (bits)) | ((value) << (32 - (bits))))
-
-#include <apt-pkg/sha256.h>
-#include <apt-pkg/strutl.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <arpa/inet.h>
-
-typedef uint32_t u32;
-typedef uint8_t  u8;
-
-static inline u32 Ch(u32 x, u32 y, u32 z)
-{
-        return z ^ (x & (y ^ z));
-}
-
-static inline u32 Maj(u32 x, u32 y, u32 z)
-{
-        return (x & y) | (z & (x | y));
-}
-
-#define e0(x)       (ror32(x, 2) ^ ror32(x,13) ^ ror32(x,22))
-#define e1(x)       (ror32(x, 6) ^ ror32(x,11) ^ ror32(x,25))
-#define s0(x)       (ror32(x, 7) ^ ror32(x,18) ^ (x >> 3))
-#define s1(x)       (ror32(x,17) ^ ror32(x,19) ^ (x >> 10))
-
-#define H0         0x6a09e667
-#define H1         0xbb67ae85
-#define H2         0x3c6ef372
-#define H3         0xa54ff53a
-#define H4         0x510e527f
-#define H5         0x9b05688c
-#define H6         0x1f83d9ab
-#define H7         0x5be0cd19
-
-static inline void LOAD_OP(int I, u32 *W, const u8 *input)		/*{{{*/
-{
-	W[I] = (  ((u32) input[I * 4 + 0] << 24)
-		| ((u32) input[I * 4 + 1] << 16)
-		| ((u32) input[I * 4 + 2] << 8)
-		| ((u32) input[I * 4 + 3]));
-}
-									/*}}}*/
-static inline void BLEND_OP(int I, u32 *W)
-{
-        W[I] = s1(W[I-2]) + W[I-7] + s0(W[I-15]) + W[I-16];
-}
-
-static void sha256_transform(u32 *state, const u8 *input)		/*{{{*/
-{
-        u32 a, b, c, d, e, f, g, h, t1, t2;
-        u32 W[64];
-        int i;
-
-        /* load the input */
-        for (i = 0; i < 16; i++)
-                LOAD_OP(i, W, input);
-
-        /* now blend */
-        for (i = 16; i < 64; i++)
-                BLEND_OP(i, W);
-    
-        /* load the state into our registers */
-        a=state[0];  b=state[1];  c=state[2];  d=state[3];
-        e=state[4];  f=state[5];  g=state[6];  h=state[7];
-
-        /* now iterate */
-        t1 = h + e1(e) + Ch(e,f,g) + 0x428a2f98 + W[ 0];
-        t2 = e0(a) + Maj(a,b,c);    d+=t1;    h=t1+t2;
-        t1 = g + e1(d) + Ch(d,e,f) + 0x71374491 + W[ 1];
-        t2 = e0(h) + Maj(h,a,b);    c+=t1;    g=t1+t2;
-        t1 = f + e1(c) + Ch(c,d,e) + 0xb5c0fbcf + W[ 2];
-        t2 = e0(g) + Maj(g,h,a);    b+=t1;    f=t1+t2;
-        t1 = e + e1(b) + Ch(b,c,d) + 0xe9b5dba5 + W[ 3];
-        t2 = e0(f) + Maj(f,g,h);    a+=t1;    e=t1+t2;
-        t1 = d + e1(a) + Ch(a,b,c) + 0x3956c25b + W[ 4];
-        t2 = e0(e) + Maj(e,f,g);    h+=t1;    d=t1+t2;
-        t1 = c + e1(h) + Ch(h,a,b) + 0x59f111f1 + W[ 5];
-        t2 = e0(d) + Maj(d,e,f);    g+=t1;    c=t1+t2;
-        t1 = b + e1(g) + Ch(g,h,a) + 0x923f82a4 + W[ 6];
-        t2 = e0(c) + Maj(c,d,e);    f+=t1;    b=t1+t2;
-        t1 = a + e1(f) + Ch(f,g,h) + 0xab1c5ed5 + W[ 7];
-        t2 = e0(b) + Maj(b,c,d);    e+=t1;    a=t1+t2;
-
-        t1 = h + e1(e) + Ch(e,f,g) + 0xd807aa98 + W[ 8];
-        t2 = e0(a) + Maj(a,b,c);    d+=t1;    h=t1+t2;
-        t1 = g + e1(d) + Ch(d,e,f) + 0x12835b01 + W[ 9];
-        t2 = e0(h) + Maj(h,a,b);    c+=t1;    g=t1+t2;
-        t1 = f + e1(c) + Ch(c,d,e) + 0x243185be + W[10];
-        t2 = e0(g) + Maj(g,h,a);    b+=t1;    f=t1+t2;
-        t1 = e + e1(b) + Ch(b,c,d) + 0x550c7dc3 + W[11];
-        t2 = e0(f) + Maj(f,g,h);    a+=t1;    e=t1+t2;
-        t1 = d + e1(a) + Ch(a,b,c) + 0x72be5d74 + W[12];
-        t2 = e0(e) + Maj(e,f,g);    h+=t1;    d=t1+t2;
-        t1 = c + e1(h) + Ch(h,a,b) + 0x80deb1fe + W[13];
-        t2 = e0(d) + Maj(d,e,f);    g+=t1;    c=t1+t2;
-        t1 = b + e1(g) + Ch(g,h,a) + 0x9bdc06a7 + W[14];
-        t2 = e0(c) + Maj(c,d,e);    f+=t1;    b=t1+t2;
-        t1 = a + e1(f) + Ch(f,g,h) + 0xc19bf174 + W[15];
-        t2 = e0(b) + Maj(b,c,d);    e+=t1;    a=t1+t2;
-
-        t1 = h + e1(e) + Ch(e,f,g) + 0xe49b69c1 + W[16];
-        t2 = e0(a) + Maj(a,b,c);    d+=t1;    h=t1+t2;
-        t1 = g + e1(d) + Ch(d,e,f) + 0xefbe4786 + W[17];
-        t2 = e0(h) + Maj(h,a,b);    c+=t1;    g=t1+t2;
-        t1 = f + e1(c) + Ch(c,d,e) + 0x0fc19dc6 + W[18];
-        t2 = e0(g) + Maj(g,h,a);    b+=t1;    f=t1+t2;
-        t1 = e + e1(b) + Ch(b,c,d) + 0x240ca1cc + W[19];
-        t2 = e0(f) + Maj(f,g,h);    a+=t1;    e=t1+t2;
-        t1 = d + e1(a) + Ch(a,b,c) + 0x2de92c6f + W[20];
-        t2 = e0(e) + Maj(e,f,g);    h+=t1;    d=t1+t2;
-        t1 = c + e1(h) + Ch(h,a,b) + 0x4a7484aa + W[21];
-        t2 = e0(d) + Maj(d,e,f);    g+=t1;    c=t1+t2;
-        t1 = b + e1(g) + Ch(g,h,a) + 0x5cb0a9dc + W[22];
-        t2 = e0(c) + Maj(c,d,e);    f+=t1;    b=t1+t2;
-        t1 = a + e1(f) + Ch(f,g,h) + 0x76f988da + W[23];
-        t2 = e0(b) + Maj(b,c,d);    e+=t1;    a=t1+t2;
-
-        t1 = h + e1(e) + Ch(e,f,g) + 0x983e5152 + W[24];
-        t2 = e0(a) + Maj(a,b,c);    d+=t1;    h=t1+t2;
-        t1 = g + e1(d) + Ch(d,e,f) + 0xa831c66d + W[25];
-        t2 = e0(h) + Maj(h,a,b);    c+=t1;    g=t1+t2;
-        t1 = f + e1(c) + Ch(c,d,e) + 0xb00327c8 + W[26];
-        t2 = e0(g) + Maj(g,h,a);    b+=t1;    f=t1+t2;
-        t1 = e + e1(b) + Ch(b,c,d) + 0xbf597fc7 + W[27];
-        t2 = e0(f) + Maj(f,g,h);    a+=t1;    e=t1+t2;
-        t1 = d + e1(a) + Ch(a,b,c) + 0xc6e00bf3 + W[28];
-        t2 = e0(e) + Maj(e,f,g);    h+=t1;    d=t1+t2;
-        t1 = c + e1(h) + Ch(h,a,b) + 0xd5a79147 + W[29];
-        t2 = e0(d) + Maj(d,e,f);    g+=t1;    c=t1+t2;
-        t1 = b + e1(g) + Ch(g,h,a) + 0x06ca6351 + W[30];
-        t2 = e0(c) + Maj(c,d,e);    f+=t1;    b=t1+t2;
-        t1 = a + e1(f) + Ch(f,g,h) + 0x14292967 + W[31];
-        t2 = e0(b) + Maj(b,c,d);    e+=t1;    a=t1+t2;
-
-        t1 = h + e1(e) + Ch(e,f,g) + 0x27b70a85 + W[32];
-        t2 = e0(a) + Maj(a,b,c);    d+=t1;    h=t1+t2;
-        t1 = g + e1(d) + Ch(d,e,f) + 0x2e1b2138 + W[33];
-        t2 = e0(h) + Maj(h,a,b);    c+=t1;    g=t1+t2;
-        t1 = f + e1(c) + Ch(c,d,e) + 0x4d2c6dfc + W[34];
-        t2 = e0(g) + Maj(g,h,a);    b+=t1;    f=t1+t2;
-        t1 = e + e1(b) + Ch(b,c,d) + 0x53380d13 + W[35];
-        t2 = e0(f) + Maj(f,g,h);    a+=t1;    e=t1+t2;
-        t1 = d + e1(a) + Ch(a,b,c) + 0x650a7354 + W[36];
-        t2 = e0(e) + Maj(e,f,g);    h+=t1;    d=t1+t2;
-        t1 = c + e1(h) + Ch(h,a,b) + 0x766a0abb + W[37];
-        t2 = e0(d) + Maj(d,e,f);    g+=t1;    c=t1+t2;
-        t1 = b + e1(g) + Ch(g,h,a) + 0x81c2c92e + W[38];
-        t2 = e0(c) + Maj(c,d,e);    f+=t1;    b=t1+t2;
-        t1 = a + e1(f) + Ch(f,g,h) + 0x92722c85 + W[39];
-        t2 = e0(b) + Maj(b,c,d);    e+=t1;    a=t1+t2;
-
-        t1 = h + e1(e) + Ch(e,f,g) + 0xa2bfe8a1 + W[40];
-        t2 = e0(a) + Maj(a,b,c);    d+=t1;    h=t1+t2;
-        t1 = g + e1(d) + Ch(d,e,f) + 0xa81a664b + W[41];
-        t2 = e0(h) + Maj(h,a,b);    c+=t1;    g=t1+t2;
-        t1 = f + e1(c) + Ch(c,d,e) + 0xc24b8b70 + W[42];
-        t2 = e0(g) + Maj(g,h,a);    b+=t1;    f=t1+t2;
-        t1 = e + e1(b) + Ch(b,c,d) + 0xc76c51a3 + W[43];
-        t2 = e0(f) + Maj(f,g,h);    a+=t1;    e=t1+t2;
-        t1 = d + e1(a) + Ch(a,b,c) + 0xd192e819 + W[44];
-        t2 = e0(e) + Maj(e,f,g);    h+=t1;    d=t1+t2;
-        t1 = c + e1(h) + Ch(h,a,b) + 0xd6990624 + W[45];
-        t2 = e0(d) + Maj(d,e,f);    g+=t1;    c=t1+t2;
-        t1 = b + e1(g) + Ch(g,h,a) + 0xf40e3585 + W[46];
-        t2 = e0(c) + Maj(c,d,e);    f+=t1;    b=t1+t2;
-        t1 = a + e1(f) + Ch(f,g,h) + 0x106aa070 + W[47];
-        t2 = e0(b) + Maj(b,c,d);    e+=t1;    a=t1+t2;
-
-        t1 = h + e1(e) + Ch(e,f,g) + 0x19a4c116 + W[48];
-        t2 = e0(a) + Maj(a,b,c);    d+=t1;    h=t1+t2;
-        t1 = g + e1(d) + Ch(d,e,f) + 0x1e376c08 + W[49];
-        t2 = e0(h) + Maj(h,a,b);    c+=t1;    g=t1+t2;
-        t1 = f + e1(c) + Ch(c,d,e) + 0x2748774c + W[50];
-        t2 = e0(g) + Maj(g,h,a);    b+=t1;    f=t1+t2;
-        t1 = e + e1(b) + Ch(b,c,d) + 0x34b0bcb5 + W[51];
-        t2 = e0(f) + Maj(f,g,h);    a+=t1;    e=t1+t2;
-        t1 = d + e1(a) + Ch(a,b,c) + 0x391c0cb3 + W[52];
-        t2 = e0(e) + Maj(e,f,g);    h+=t1;    d=t1+t2;
-        t1 = c + e1(h) + Ch(h,a,b) + 0x4ed8aa4a + W[53];
-        t2 = e0(d) + Maj(d,e,f);    g+=t1;    c=t1+t2;
-        t1 = b + e1(g) + Ch(g,h,a) + 0x5b9cca4f + W[54];
-        t2 = e0(c) + Maj(c,d,e);    f+=t1;    b=t1+t2;
-        t1 = a + e1(f) + Ch(f,g,h) + 0x682e6ff3 + W[55];
-        t2 = e0(b) + Maj(b,c,d);    e+=t1;    a=t1+t2;
-
-        t1 = h + e1(e) + Ch(e,f,g) + 0x748f82ee + W[56];
-        t2 = e0(a) + Maj(a,b,c);    d+=t1;    h=t1+t2;
-        t1 = g + e1(d) + Ch(d,e,f) + 0x78a5636f + W[57];
-        t2 = e0(h) + Maj(h,a,b);    c+=t1;    g=t1+t2;
-        t1 = f + e1(c) + Ch(c,d,e) + 0x84c87814 + W[58];
-        t2 = e0(g) + Maj(g,h,a);    b+=t1;    f=t1+t2;
-        t1 = e + e1(b) + Ch(b,c,d) + 0x8cc70208 + W[59];
-        t2 = e0(f) + Maj(f,g,h);    a+=t1;    e=t1+t2;
-        t1 = d + e1(a) + Ch(a,b,c) + 0x90befffa + W[60];
-        t2 = e0(e) + Maj(e,f,g);    h+=t1;    d=t1+t2;
-        t1 = c + e1(h) + Ch(h,a,b) + 0xa4506ceb + W[61];
-        t2 = e0(d) + Maj(d,e,f);    g+=t1;    c=t1+t2;
-        t1 = b + e1(g) + Ch(g,h,a) + 0xbef9a3f7 + W[62];
-        t2 = e0(c) + Maj(c,d,e);    f+=t1;    b=t1+t2;
-        t1 = a + e1(f) + Ch(f,g,h) + 0xc67178f2 + W[63];
-        t2 = e0(b) + Maj(b,c,d);    e+=t1;    a=t1+t2;
-
-        state[0] += a; state[1] += b; state[2] += c; state[3] += d;
-        state[4] += e; state[5] += f; state[6] += g; state[7] += h;
-
-        /* clear any sensitive info... */
-        a = b = c = d = e = f = g = h = t1 = t2 = 0;
-        memset(W, 0, 64 * sizeof(u32));
-}
-									/*}}}*/
-SHA256Summation::SHA256Summation()					/*{{{*/
-{
-        Sum.state[0] = H0;
-        Sum.state[1] = H1;
-        Sum.state[2] = H2;
-        Sum.state[3] = H3;
-        Sum.state[4] = H4;
-        Sum.state[5] = H5;
-        Sum.state[6] = H6;
-        Sum.state[7] = H7;
-        Sum.count[0] = Sum.count[1] = 0;
-        memset(Sum.buf, 0, sizeof(Sum.buf));
-        Done = false;
-}
-									/*}}}*/
-bool SHA256Summation::Add(const u8 *data, unsigned long len)		/*{{{*/
-{
-        struct sha256_ctx *sctx = &Sum;
-        unsigned int i, index, part_len;
-
-        if (Done) return false;
-
-        /* Compute number of bytes mod 128 */
-        index = (unsigned int)((sctx->count[0] >> 3) & 0x3f);
-
-        /* Update number of bits */
-        if ((sctx->count[0] += (len << 3)) < (len << 3)) {
-                sctx->count[1]++;
-                sctx->count[1] += (len >> 29);
-        }
-
-        part_len = 64 - index;
-
-        /* Transform as many times as possible. */
-        if (len >= part_len) {
-                memcpy(&sctx->buf[index], data, part_len);
-                sha256_transform(sctx->state, sctx->buf);
-
-                for (i = part_len; i + 63 < len; i += 64)
-                        sha256_transform(sctx->state, &data[i]);
-                index = 0;
-        } else {
-                i = 0;
-        }
-
-        /* Buffer remaining input */
-        memcpy(&sctx->buf[index], &data[i], len-i);
-
-        return true;
-}
-									/*}}}*/
-SHA256SumValue SHA256Summation::Result()				/*{{{*/
-{
-   struct sha256_ctx *sctx = &Sum;
-   if (!Done) {
-        u8 bits[8];
-        unsigned int index, pad_len, t;
-        static const u8 padding[64] = { 0x80, };
-
-        /* Save number of bits */
-        t = sctx->count[0];
-        bits[7] = t; t >>= 8;
-        bits[6] = t; t >>= 8;
-        bits[5] = t; t >>= 8;
-        bits[4] = t;
-        t = sctx->count[1];
-        bits[3] = t; t >>= 8;
-        bits[2] = t; t >>= 8;
-        bits[1] = t; t >>= 8;
-        bits[0] = t;
-
-        /* Pad out to 56 mod 64. */
-        index = (sctx->count[0] >> 3) & 0x3f;
-        pad_len = (index < 56) ? (56 - index) : ((64+56) - index);
-        Add(padding, pad_len);
-
-        /* Append length (before padding) */
-        Add(bits, 8);
-   }
-
-   Done = true;
-
-   /* Store state in digest */
-
-   SHA256SumValue res;
-   u8 *out = res.Sum;
-
-   int i, j;
-   unsigned int t;
-   for (i = j = 0; i < 8; i++, j += 4) {
-      t = sctx->state[i];
-      out[j+3] = t; t >>= 8;
-      out[j+2] = t; t >>= 8;
-      out[j+1] = t; t >>= 8;
-      out[j  ] = t;
-   }
-
-   return res;
-}
-									/*}}}*/
-// SHA256SumValue::SHA256SumValue - Constructs the sum from a string   /*{{{*/
-// ---------------------------------------------------------------------
-/* The string form of a SHA256 is a 64 character hex number */
-SHA256SumValue::SHA256SumValue(string Str)
-{
-   memset(Sum,0,sizeof(Sum));
-   Set(Str);
-}
-                                                                       /*}}}*/
-// SHA256SumValue::SHA256SumValue - Default constructor                /*{{{*/
-// ---------------------------------------------------------------------
-/* Sets the value to 0 */
-SHA256SumValue::SHA256SumValue()
-{
-   memset(Sum,0,sizeof(Sum));
-}
-                                                                       /*}}}*/
-// SHA256SumValue::Set - Set the sum from a string                     /*{{{*/
-// ---------------------------------------------------------------------
-/* Converts the hex string into a set of chars */
-bool SHA256SumValue::Set(string Str)
-{
-   return Hex2Num(Str,Sum,sizeof(Sum));
-}
-                                                                       /*}}}*/
-// SHA256SumValue::Value - Convert the number into a string            /*{{{*/
-// ---------------------------------------------------------------------
-/* Converts the set of chars into a hex string in lower case */
-string SHA256SumValue::Value() const
-{
-   char Conv[16] =
-      { '0','1','2','3','4','5','6','7','8','9','a','b',
-      'c','d','e','f'
-   };
-   char Result[65];
-   Result[64] = 0;
-
-   // Convert each char into two letters
-   int J = 0;
-   int I = 0;
-   for (; I != 64; J++,I += 2)
-   {
-      Result[I] = Conv[Sum[J] >> 4];
-      Result[I + 1] = Conv[Sum[J] & 0xF];
-   }
-
-   return string(Result);
-}
-									/*}}}*/
-// SHA256SumValue::operator == - Comparator                            /*{{{*/
-// ---------------------------------------------------------------------
-/* Call memcmp on the buffer */
-bool SHA256SumValue::operator == (const SHA256SumValue & rhs) const
-{
-   return memcmp(Sum,rhs.Sum,sizeof(Sum)) == 0;
-}
-                                                                       /*}}}*/
-// SHA256Summation::AddFD - Add content of file into the checksum      /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool SHA256Summation::AddFD(int Fd,unsigned long Size)
-{
-   unsigned char Buf[64 * 64];
-   int Res = 0;
-   int ToEOF = (Size == 0);
-   while (Size != 0 || ToEOF)
-   {
-      unsigned n = sizeof(Buf);
-      if (!ToEOF) n = min(Size,(unsigned long)n);
-      Res = read(Fd,Buf,n);
-      if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read
-         return false;
-      if (ToEOF && Res == 0) // EOF
-         break;
-      Size -= Res;
-      Add(Buf,Res);
-   }
-   return true;
-}
-                                                                       /*}}}*/
-
diff --git a/apt-pkg/contrib/sha256.h b/apt-pkg/contrib/sha256.h
index 5934b5641..15146c948 100644
--- a/apt-pkg/contrib/sha256.h
+++ b/apt-pkg/contrib/sha256.h
@@ -1,72 +1,8 @@
-// -*- mode: cpp; mode: fold -*-
-// Description                                                          /*{{{*/
-// $Id: sha1.h,v 1.3 2001/05/07 05:05:47 jgg Exp $
-/* ######################################################################
-
-   SHA256SumValue - Storage for a SHA-256 hash.
-   SHA256Summation - SHA-256 Secure Hash Algorithm.
-   
-   This is a C++ interface to a set of SHA256Sum functions, that mirrors
-   the equivalent MD5 & SHA1 classes. 
-
-   ##################################################################### */
-                                                                        /*}}}*/
 #ifndef APTPKG_SHA256_H
 #define APTPKG_SHA256_H
 
-#include <string>
-#include <cstring>
-#include <algorithm>
-#include <stdint.h>
-
-using std::string;
-using std::min;
-
-class SHA256Summation;
-
-class SHA256SumValue
-{
-   friend class SHA256Summation;
-   unsigned char Sum[32];
-   
-   public:
-
-   // Accessors
-   bool operator ==(const SHA256SumValue &rhs) const; 
-   string Value() const;
-   inline void Value(unsigned char S[32])
-         {for (int I = 0; I != sizeof(Sum); I++) S[I] = Sum[I];};
-   inline operator string() const {return Value();};
-   bool Set(string Str);
-   inline void Set(unsigned char S[32]) 
-         {for (int I = 0; I != sizeof(Sum); I++) Sum[I] = S[I];};
-
-   SHA256SumValue(string Str);
-   SHA256SumValue();
-};
-
-struct sha256_ctx {
-    uint32_t count[2];
-    uint32_t state[8];
-    uint8_t buf[128];
-};
-
-class SHA256Summation
-{
-   struct sha256_ctx Sum;
-
-   bool Done;
-
-   public:
+#include "sha2.h"
 
-   bool Add(const unsigned char *inbuf,unsigned long inlen);
-   inline bool Add(const char *Data) {return Add((unsigned char *)Data,strlen(Data));};
-   bool AddFD(int Fd,unsigned long Size);
-   inline bool Add(const unsigned char *Beg,const unsigned char *End) 
-                  {return Add(Beg,End-Beg);};
-   SHA256SumValue Result();
-   
-   SHA256Summation();
-};
+#warning "This header is deprecated, please include sha2.h instead"
 
 #endif
diff --git a/apt-pkg/contrib/sha2_internal.cc b/apt-pkg/contrib/sha2_internal.cc
new file mode 100644
index 000000000..6d27e8f2b
--- /dev/null
+++ b/apt-pkg/contrib/sha2_internal.cc
@@ -0,0 +1,1076 @@
+/*
+ * FILE:	sha2.c
+ * AUTHOR:	Aaron D. Gifford - http://www.aarongifford.com/
+ * 
+ * Copyright (c) 2000-2001, Aaron D. Gifford
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id: sha2.c,v 1.1 2001/11/08 00:01:51 adg Exp adg $
+ */
+#include <config.h>
+
+#include <string.h>	/* memcpy()/memset() or bcopy()/bzero() */
+#include <assert.h>	/* assert() */
+#include "sha2_internal.h"
+
+/*
+ * ASSERT NOTE:
+ * Some sanity checking code is included using assert().  On my FreeBSD
+ * system, this additional code can be removed by compiling with NDEBUG
+ * defined.  Check your own systems manpage on assert() to see how to
+ * compile WITHOUT the sanity checking code on your system.
+ *
+ * UNROLLED TRANSFORM LOOP NOTE:
+ * You can define SHA2_UNROLL_TRANSFORM to use the unrolled transform
+ * loop version for the hash transform rounds (defined using macros
+ * later in this file).  Either define on the command line, for example:
+ *
+ *   cc -DSHA2_UNROLL_TRANSFORM -o sha2 sha2.c sha2prog.c
+ *
+ * or define below:
+ *
+ *   #define SHA2_UNROLL_TRANSFORM
+ *
+ */
+
+
+/*** SHA-256/384/512 Machine Architecture Definitions *****************/
+/*
+ * BYTE_ORDER NOTE:
+ *
+ * Please make sure that your system defines BYTE_ORDER.  If your
+ * architecture is little-endian, make sure it also defines
+ * LITTLE_ENDIAN and that the two (BYTE_ORDER and LITTLE_ENDIAN) are
+ * equivilent.
+ *
+ * If your system does not define the above, then you can do so by
+ * hand like this:
+ *
+ *   #define LITTLE_ENDIAN 1234
+ *   #define BIG_ENDIAN    4321
+ *
+ * And for little-endian machines, add:
+ *
+ *   #define BYTE_ORDER LITTLE_ENDIAN 
+ *
+ * Or for big-endian machines:
+ *
+ *   #define BYTE_ORDER BIG_ENDIAN
+ *
+ * The FreeBSD machine this was written on defines BYTE_ORDER
+ * appropriately by including <sys/types.h> (which in turn includes
+ * <machine/endian.h> where the appropriate definitions are actually
+ * made).
+ */
+#if !defined(BYTE_ORDER) || (BYTE_ORDER != LITTLE_ENDIAN && BYTE_ORDER != BIG_ENDIAN)
+#error Define BYTE_ORDER to be equal to either LITTLE_ENDIAN or BIG_ENDIAN
+#endif
+
+/*
+ * Define the followingsha2_* types to types of the correct length on
+ * the native archtecture.   Most BSD systems and Linux define u_intXX_t
+ * types.  Machines with very recent ANSI C headers, can use the
+ * uintXX_t definintions from inttypes.h by defining SHA2_USE_INTTYPES_H
+ * during compile or in the sha.h header file.
+ *
+ * Machines that support neither u_intXX_t nor inttypes.h's uintXX_t
+ * will need to define these three typedefs below (and the appropriate
+ * ones in sha.h too) by hand according to their system architecture.
+ *
+ * Thank you, Jun-ichiro itojun Hagino, for suggesting using u_intXX_t
+ * types and pointing out recent ANSI C support for uintXX_t in inttypes.h.
+ */
+#ifdef SHA2_USE_INTTYPES_H
+
+typedef uint8_t  sha2_byte;	/* Exactly 1 byte */
+typedef uint32_t sha2_word32;	/* Exactly 4 bytes */
+typedef uint64_t sha2_word64;	/* Exactly 8 bytes */
+
+#else /* SHA2_USE_INTTYPES_H */
+
+typedef u_int8_t  sha2_byte;	/* Exactly 1 byte */
+typedef u_int32_t sha2_word32;	/* Exactly 4 bytes */
+typedef u_int64_t sha2_word64;	/* Exactly 8 bytes */
+
+#endif /* SHA2_USE_INTTYPES_H */
+
+
+/*** SHA-256/384/512 Various Length Definitions ***********************/
+/* NOTE: Most of these are in sha2.h */
+#define SHA256_SHORT_BLOCK_LENGTH	(SHA256_BLOCK_LENGTH - 8)
+#define SHA384_SHORT_BLOCK_LENGTH	(SHA384_BLOCK_LENGTH - 16)
+#define SHA512_SHORT_BLOCK_LENGTH	(SHA512_BLOCK_LENGTH - 16)
+
+
+/*** ENDIAN REVERSAL MACROS *******************************************/
+#if BYTE_ORDER == LITTLE_ENDIAN
+#define REVERSE32(w,x)	{ \
+	sha2_word32 tmp = (w); \
+	tmp = (tmp >> 16) | (tmp << 16); \
+	(x) = ((tmp & 0xff00ff00UL) >> 8) | ((tmp & 0x00ff00ffUL) << 8); \
+}
+#define REVERSE64(w,x)	{ \
+	sha2_word64 tmp = (w); \
+	tmp = (tmp >> 32) | (tmp << 32); \
+	tmp = ((tmp & 0xff00ff00ff00ff00ULL) >> 8) | \
+	      ((tmp & 0x00ff00ff00ff00ffULL) << 8); \
+	(x) = ((tmp & 0xffff0000ffff0000ULL) >> 16) | \
+	      ((tmp & 0x0000ffff0000ffffULL) << 16); \
+}
+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+/*
+ * Macro for incrementally adding the unsigned 64-bit integer n to the
+ * unsigned 128-bit integer (represented using a two-element array of
+ * 64-bit words):
+ */
+#define ADDINC128(w,n)	{ \
+	(w)[0] += (sha2_word64)(n); \
+	if ((w)[0] < (n)) { \
+		(w)[1]++; \
+	} \
+}
+
+/*
+ * Macros for copying blocks of memory and for zeroing out ranges
+ * of memory.  Using these macros makes it easy to switch from
+ * using memset()/memcpy() and using bzero()/bcopy().
+ *
+ * Please define either SHA2_USE_MEMSET_MEMCPY or define
+ * SHA2_USE_BZERO_BCOPY depending on which function set you
+ * choose to use:
+ */
+#if !defined(SHA2_USE_MEMSET_MEMCPY) && !defined(SHA2_USE_BZERO_BCOPY)
+/* Default to memset()/memcpy() if no option is specified */
+#define	SHA2_USE_MEMSET_MEMCPY	1
+#endif
+#if defined(SHA2_USE_MEMSET_MEMCPY) && defined(SHA2_USE_BZERO_BCOPY)
+/* Abort with an error if BOTH options are defined */
+#error Define either SHA2_USE_MEMSET_MEMCPY or SHA2_USE_BZERO_BCOPY, not both!
+#endif
+
+#ifdef SHA2_USE_MEMSET_MEMCPY
+#define MEMSET_BZERO(p,l)	memset((p), 0, (l))
+#define MEMCPY_BCOPY(d,s,l)	memcpy((d), (s), (l))
+#endif
+#ifdef SHA2_USE_BZERO_BCOPY
+#define MEMSET_BZERO(p,l)	bzero((p), (l))
+#define MEMCPY_BCOPY(d,s,l)	bcopy((s), (d), (l))
+#endif
+
+
+/*** THE SIX LOGICAL FUNCTIONS ****************************************/
+/*
+ * Bit shifting and rotation (used by the six SHA-XYZ logical functions:
+ *
+ *   NOTE:  The naming of R and S appears backwards here (R is a SHIFT and
+ *   S is a ROTATION) because the SHA-256/384/512 description document
+ *   (see http://csrc.nist.gov/cryptval/shs/sha256-384-512.pdf) uses this
+ *   same "backwards" definition.
+ */
+/* Shift-right (used in SHA-256, SHA-384, and SHA-512): */
+#define R(b,x) 		((x) >> (b))
+/* 32-bit Rotate-right (used in SHA-256): */
+#define S32(b,x)	(((x) >> (b)) | ((x) << (32 - (b))))
+/* 64-bit Rotate-right (used in SHA-384 and SHA-512): */
+#define S64(b,x)	(((x) >> (b)) | ((x) << (64 - (b))))
+
+/* Two of six logical functions used in SHA-256, SHA-384, and SHA-512: */
+#define Ch(x,y,z)	(((x) & (y)) ^ ((~(x)) & (z)))
+#define Maj(x,y,z)	(((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
+
+/* Four of six logical functions used in SHA-256: */
+#define Sigma0_256(x)	(S32(2,  (x)) ^ S32(13, (x)) ^ S32(22, (x)))
+#define Sigma1_256(x)	(S32(6,  (x)) ^ S32(11, (x)) ^ S32(25, (x)))
+#define sigma0_256(x)	(S32(7,  (x)) ^ S32(18, (x)) ^ R(3 ,   (x)))
+#define sigma1_256(x)	(S32(17, (x)) ^ S32(19, (x)) ^ R(10,   (x)))
+
+/* Four of six logical functions used in SHA-384 and SHA-512: */
+#define Sigma0_512(x)	(S64(28, (x)) ^ S64(34, (x)) ^ S64(39, (x)))
+#define Sigma1_512(x)	(S64(14, (x)) ^ S64(18, (x)) ^ S64(41, (x)))
+#define sigma0_512(x)	(S64( 1, (x)) ^ S64( 8, (x)) ^ R( 7,   (x)))
+#define sigma1_512(x)	(S64(19, (x)) ^ S64(61, (x)) ^ R( 6,   (x)))
+
+/*** INTERNAL FUNCTION PROTOTYPES *************************************/
+/* NOTE: These should not be accessed directly from outside this
+ * library -- they are intended for private internal visibility/use
+ * only.
+ */
+static void SHA512_Last(SHA512_CTX*);
+static void SHA256_Transform(SHA256_CTX*, const sha2_word32*);
+static void SHA512_Transform(SHA512_CTX*, const sha2_word64*);
+
+
+/*** SHA-XYZ INITIAL HASH VALUES AND CONSTANTS ************************/
+/* Hash constant words K for SHA-256: */
+const static sha2_word32 K256[64] = {
+	0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL,
+	0x3956c25bUL, 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL,
+	0xd807aa98UL, 0x12835b01UL, 0x243185beUL, 0x550c7dc3UL,
+	0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL, 0xc19bf174UL,
+	0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL,
+	0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL,
+	0x983e5152UL, 0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL,
+	0xc6e00bf3UL, 0xd5a79147UL, 0x06ca6351UL, 0x14292967UL,
+	0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL, 0x53380d13UL,
+	0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL,
+	0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL,
+	0xd192e819UL, 0xd6990624UL, 0xf40e3585UL, 0x106aa070UL,
+	0x19a4c116UL, 0x1e376c08UL, 0x2748774cUL, 0x34b0bcb5UL,
+	0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL, 0x682e6ff3UL,
+	0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL,
+	0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL
+};
+
+/* Initial hash value H for SHA-256: */
+const static sha2_word32 sha256_initial_hash_value[8] = {
+	0x6a09e667UL,
+	0xbb67ae85UL,
+	0x3c6ef372UL,
+	0xa54ff53aUL,
+	0x510e527fUL,
+	0x9b05688cUL,
+	0x1f83d9abUL,
+	0x5be0cd19UL
+};
+
+/* Hash constant words K for SHA-384 and SHA-512: */
+const static sha2_word64 K512[80] = {
+	0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL,
+	0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL,
+	0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
+	0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL,
+	0xd807aa98a3030242ULL, 0x12835b0145706fbeULL,
+	0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
+	0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL,
+	0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL,
+	0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL,
+	0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL,
+	0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL,
+	0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
+	0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL,
+	0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL,
+	0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL,
+	0x06ca6351e003826fULL, 0x142929670a0e6e70ULL,
+	0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL,
+	0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
+	0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL,
+	0x81c2c92e47edaee6ULL, 0x92722c851482353bULL,
+	0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL,
+	0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL,
+	0xd192e819d6ef5218ULL, 0xd69906245565a910ULL,
+	0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
+	0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL,
+	0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL,
+	0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL,
+	0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL,
+	0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL,
+	0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
+	0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL,
+	0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL,
+	0xca273eceea26619cULL, 0xd186b8c721c0c207ULL,
+	0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL,
+	0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL,
+	0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
+	0x28db77f523047d84ULL, 0x32caab7b40c72493ULL,
+	0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL,
+	0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL,
+	0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL
+};
+
+/* Initial hash value H for SHA-384 */
+const static sha2_word64 sha384_initial_hash_value[8] = {
+	0xcbbb9d5dc1059ed8ULL,
+	0x629a292a367cd507ULL,
+	0x9159015a3070dd17ULL,
+	0x152fecd8f70e5939ULL,
+	0x67332667ffc00b31ULL,
+	0x8eb44a8768581511ULL,
+	0xdb0c2e0d64f98fa7ULL,
+	0x47b5481dbefa4fa4ULL
+};
+
+/* Initial hash value H for SHA-512 */
+const static sha2_word64 sha512_initial_hash_value[8] = {
+	0x6a09e667f3bcc908ULL,
+	0xbb67ae8584caa73bULL,
+	0x3c6ef372fe94f82bULL,
+	0xa54ff53a5f1d36f1ULL,
+	0x510e527fade682d1ULL,
+	0x9b05688c2b3e6c1fULL,
+	0x1f83d9abfb41bd6bULL,
+	0x5be0cd19137e2179ULL
+};
+
+/*
+ * Constant used by SHA256/384/512_End() functions for converting the
+ * digest to a readable hexadecimal character string:
+ */
+static const char *sha2_hex_digits = "0123456789abcdef";
+
+
+/*** SHA-256: *********************************************************/
+void SHA256_Init(SHA256_CTX* context) {
+	if (context == (SHA256_CTX*)0) {
+		return;
+	}
+	MEMCPY_BCOPY(context->state, sha256_initial_hash_value, SHA256_DIGEST_LENGTH);
+	MEMSET_BZERO(context->buffer, SHA256_BLOCK_LENGTH);
+	context->bitcount = 0;
+}
+
+#ifdef SHA2_UNROLL_TRANSFORM
+
+/* Unrolled SHA-256 round macros: */
+
+#if BYTE_ORDER == LITTLE_ENDIAN
+
+#define ROUND256_0_TO_15(a,b,c,d,e,f,g,h)	\
+	REVERSE32(*data++, W256[j]); \
+	T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + \
+             K256[j] + W256[j]; \
+	(d) += T1; \
+	(h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
+	j++
+
+
+#else /* BYTE_ORDER == LITTLE_ENDIAN */
+
+#define ROUND256_0_TO_15(a,b,c,d,e,f,g,h)	\
+	T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + \
+	     K256[j] + (W256[j] = *data++); \
+	(d) += T1; \
+	(h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
+	j++
+
+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+#define ROUND256(a,b,c,d,e,f,g,h)	\
+	s0 = W256[(j+1)&0x0f]; \
+	s0 = sigma0_256(s0); \
+	s1 = W256[(j+14)&0x0f]; \
+	s1 = sigma1_256(s1); \
+	T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + K256[j] + \
+	     (W256[j&0x0f] += s1 + W256[(j+9)&0x0f] + s0); \
+	(d) += T1; \
+	(h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
+	j++
+
+static void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
+	sha2_word32	a, b, c, d, e, f, g, h, s0, s1;
+	sha2_word32	T1, *W256;
+	int		j;
+
+	W256 = (sha2_word32*)context->buffer;
+
+	/* Initialize registers with the prev. intermediate value */
+	a = context->state[0];
+	b = context->state[1];
+	c = context->state[2];
+	d = context->state[3];
+	e = context->state[4];
+	f = context->state[5];
+	g = context->state[6];
+	h = context->state[7];
+
+	j = 0;
+	do {
+		/* Rounds 0 to 15 (unrolled): */
+		ROUND256_0_TO_15(a,b,c,d,e,f,g,h);
+		ROUND256_0_TO_15(h,a,b,c,d,e,f,g);
+		ROUND256_0_TO_15(g,h,a,b,c,d,e,f);
+		ROUND256_0_TO_15(f,g,h,a,b,c,d,e);
+		ROUND256_0_TO_15(e,f,g,h,a,b,c,d);
+		ROUND256_0_TO_15(d,e,f,g,h,a,b,c);
+		ROUND256_0_TO_15(c,d,e,f,g,h,a,b);
+		ROUND256_0_TO_15(b,c,d,e,f,g,h,a);
+	} while (j < 16);
+
+	/* Now for the remaining rounds to 64: */
+	do {
+		ROUND256(a,b,c,d,e,f,g,h);
+		ROUND256(h,a,b,c,d,e,f,g);
+		ROUND256(g,h,a,b,c,d,e,f);
+		ROUND256(f,g,h,a,b,c,d,e);
+		ROUND256(e,f,g,h,a,b,c,d);
+		ROUND256(d,e,f,g,h,a,b,c);
+		ROUND256(c,d,e,f,g,h,a,b);
+		ROUND256(b,c,d,e,f,g,h,a);
+	} while (j < 64);
+
+	/* Compute the current intermediate hash value */
+	context->state[0] += a;
+	context->state[1] += b;
+	context->state[2] += c;
+	context->state[3] += d;
+	context->state[4] += e;
+	context->state[5] += f;
+	context->state[6] += g;
+	context->state[7] += h;
+
+	/* Clean up */
+	a = b = c = d = e = f = g = h = T1 = 0;
+}
+
+#else /* SHA2_UNROLL_TRANSFORM */
+
+static void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
+	sha2_word32	a, b, c, d, e, f, g, h, s0, s1;
+	sha2_word32	T1, T2, *W256;
+	int		j;
+
+	W256 = (sha2_word32*)context->buffer;
+
+	/* Initialize registers with the prev. intermediate value */
+	a = context->state[0];
+	b = context->state[1];
+	c = context->state[2];
+	d = context->state[3];
+	e = context->state[4];
+	f = context->state[5];
+	g = context->state[6];
+	h = context->state[7];
+
+	j = 0;
+	do {
+#if BYTE_ORDER == LITTLE_ENDIAN
+		/* Copy data while converting to host byte order */
+		REVERSE32(*data++,W256[j]);
+		/* Apply the SHA-256 compression function to update a..h */
+		T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + W256[j];
+#else /* BYTE_ORDER == LITTLE_ENDIAN */
+		/* Apply the SHA-256 compression function to update a..h with copy */
+		T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + (W256[j] = *data++);
+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+		T2 = Sigma0_256(a) + Maj(a, b, c);
+		h = g;
+		g = f;
+		f = e;
+		e = d + T1;
+		d = c;
+		c = b;
+		b = a;
+		a = T1 + T2;
+
+		j++;
+	} while (j < 16);
+
+	do {
+		/* Part of the message block expansion: */
+		s0 = W256[(j+1)&0x0f];
+		s0 = sigma0_256(s0);
+		s1 = W256[(j+14)&0x0f];	
+		s1 = sigma1_256(s1);
+
+		/* Apply the SHA-256 compression function to update a..h */
+		T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + 
+		     (W256[j&0x0f] += s1 + W256[(j+9)&0x0f] + s0);
+		T2 = Sigma0_256(a) + Maj(a, b, c);
+		h = g;
+		g = f;
+		f = e;
+		e = d + T1;
+		d = c;
+		c = b;
+		b = a;
+		a = T1 + T2;
+
+		j++;
+	} while (j < 64);
+
+	/* Compute the current intermediate hash value */
+	context->state[0] += a;
+	context->state[1] += b;
+	context->state[2] += c;
+	context->state[3] += d;
+	context->state[4] += e;
+	context->state[5] += f;
+	context->state[6] += g;
+	context->state[7] += h;
+
+	/* Clean up */
+	a = b = c = d = e = f = g = h = T1 = T2 = 0;
+}
+
+#endif /* SHA2_UNROLL_TRANSFORM */
+
+void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
+	unsigned int	freespace, usedspace;
+
+	if (len == 0) {
+		/* Calling with no data is valid - we do nothing */
+		return;
+	}
+
+	/* Sanity check: */
+	assert(context != (SHA256_CTX*)0 && data != (sha2_byte*)0);
+
+	usedspace = (context->bitcount >> 3) % SHA256_BLOCK_LENGTH;
+	if (usedspace > 0) {
+		/* Calculate how much free space is available in the buffer */
+		freespace = SHA256_BLOCK_LENGTH - usedspace;
+
+		if (len >= freespace) {
+			/* Fill the buffer completely and process it */
+			MEMCPY_BCOPY(&context->buffer[usedspace], data, freespace);
+			context->bitcount += freespace << 3;
+			len -= freespace;
+			data += freespace;
+			SHA256_Transform(context, (sha2_word32*)context->buffer);
+		} else {
+			/* The buffer is not yet full */
+			MEMCPY_BCOPY(&context->buffer[usedspace], data, len);
+			context->bitcount += len << 3;
+			/* Clean up: */
+			usedspace = freespace = 0;
+			return;
+		}
+	}
+	while (len >= SHA256_BLOCK_LENGTH) {
+		/* Process as many complete blocks as we can */
+		SHA256_Transform(context, (sha2_word32*)data);
+		context->bitcount += SHA256_BLOCK_LENGTH << 3;
+		len -= SHA256_BLOCK_LENGTH;
+		data += SHA256_BLOCK_LENGTH;
+	}
+	if (len > 0) {
+		/* There's left-overs, so save 'em */
+		MEMCPY_BCOPY(context->buffer, data, len);
+		context->bitcount += len << 3;
+	}
+	/* Clean up: */
+	usedspace = freespace = 0;
+}
+
+void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
+	sha2_word32	*d = (sha2_word32*)digest;
+	unsigned int	usedspace;
+
+	/* Sanity check: */
+	assert(context != (SHA256_CTX*)0);
+
+	/* If no digest buffer is passed, we don't bother doing this: */
+	if (digest != (sha2_byte*)0) {
+		usedspace = (context->bitcount >> 3) % SHA256_BLOCK_LENGTH;
+#if BYTE_ORDER == LITTLE_ENDIAN
+		/* Convert FROM host byte order */
+		REVERSE64(context->bitcount,context->bitcount);
+#endif
+		if (usedspace > 0) {
+			/* Begin padding with a 1 bit: */
+			context->buffer[usedspace++] = 0x80;
+
+			if (usedspace <= SHA256_SHORT_BLOCK_LENGTH) {
+				/* Set-up for the last transform: */
+				MEMSET_BZERO(&context->buffer[usedspace], SHA256_SHORT_BLOCK_LENGTH - usedspace);
+			} else {
+				if (usedspace < SHA256_BLOCK_LENGTH) {
+					MEMSET_BZERO(&context->buffer[usedspace], SHA256_BLOCK_LENGTH - usedspace);
+				}
+				/* Do second-to-last transform: */
+				SHA256_Transform(context, (sha2_word32*)context->buffer);
+
+				/* And set-up for the last transform: */
+				MEMSET_BZERO(context->buffer, SHA256_SHORT_BLOCK_LENGTH);
+			}
+		} else {
+			/* Set-up for the last transform: */
+			MEMSET_BZERO(context->buffer, SHA256_SHORT_BLOCK_LENGTH);
+
+			/* Begin padding with a 1 bit: */
+			*context->buffer = 0x80;
+		}
+		/* Set the bit count: */
+		union {
+			sha2_byte* c;
+			sha2_word64* l;
+		} bitcount;
+		bitcount.c = &context->buffer[SHA256_SHORT_BLOCK_LENGTH];
+		*(bitcount.l) = context->bitcount;
+
+		/* Final transform: */
+		SHA256_Transform(context, (sha2_word32*)context->buffer);
+
+#if BYTE_ORDER == LITTLE_ENDIAN
+		{
+			/* Convert TO host byte order */
+			int	j;
+			for (j = 0; j < 8; j++) {
+				REVERSE32(context->state[j],context->state[j]);
+				*d++ = context->state[j];
+			}
+		}
+#else
+		MEMCPY_BCOPY(d, context->state, SHA256_DIGEST_LENGTH);
+#endif
+	}
+
+	/* Clean up state data: */
+	MEMSET_BZERO(context, sizeof(context));
+	usedspace = 0;
+}
+
+char *SHA256_End(SHA256_CTX* context, char buffer[]) {
+	sha2_byte	digest[SHA256_DIGEST_LENGTH], *d = digest;
+	int		i;
+
+	/* Sanity check: */
+	assert(context != (SHA256_CTX*)0);
+
+	if (buffer != (char*)0) {
+		SHA256_Final(digest, context);
+
+		for (i = 0; i < SHA256_DIGEST_LENGTH; i++) {
+			*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
+			*buffer++ = sha2_hex_digits[*d & 0x0f];
+			d++;
+		}
+		*buffer = (char)0;
+	} else {
+		MEMSET_BZERO(context, sizeof(context));
+	}
+	MEMSET_BZERO(digest, SHA256_DIGEST_LENGTH);
+	return buffer;
+}
+
+char* SHA256_Data(const sha2_byte* data, size_t len, char digest[SHA256_DIGEST_STRING_LENGTH]) {
+	SHA256_CTX	context;
+
+	SHA256_Init(&context);
+	SHA256_Update(&context, data, len);
+	return SHA256_End(&context, digest);
+}
+
+
+/*** SHA-512: *********************************************************/
+void SHA512_Init(SHA512_CTX* context) {
+	if (context == (SHA512_CTX*)0) {
+		return;
+	}
+	MEMCPY_BCOPY(context->state, sha512_initial_hash_value, SHA512_DIGEST_LENGTH);
+	MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH);
+	context->bitcount[0] = context->bitcount[1] =  0;
+}
+
+#ifdef SHA2_UNROLL_TRANSFORM
+
+/* Unrolled SHA-512 round macros: */
+#if BYTE_ORDER == LITTLE_ENDIAN
+
+#define ROUND512_0_TO_15(a,b,c,d,e,f,g,h)	\
+	REVERSE64(*data++, W512[j]); \
+	T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \
+             K512[j] + W512[j]; \
+	(d) += T1, \
+	(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)), \
+	j++
+
+
+#else /* BYTE_ORDER == LITTLE_ENDIAN */
+
+#define ROUND512_0_TO_15(a,b,c,d,e,f,g,h)	\
+	T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \
+             K512[j] + (W512[j] = *data++); \
+	(d) += T1; \
+	(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \
+	j++
+
+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+#define ROUND512(a,b,c,d,e,f,g,h)	\
+	s0 = W512[(j+1)&0x0f]; \
+	s0 = sigma0_512(s0); \
+	s1 = W512[(j+14)&0x0f]; \
+	s1 = sigma1_512(s1); \
+	T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + K512[j] + \
+             (W512[j&0x0f] += s1 + W512[(j+9)&0x0f] + s0); \
+	(d) += T1; \
+	(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \
+	j++
+
+static void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
+	sha2_word64	a, b, c, d, e, f, g, h, s0, s1;
+	sha2_word64	T1, *W512 = (sha2_word64*)context->buffer;
+	int		j;
+
+	/* Initialize registers with the prev. intermediate value */
+	a = context->state[0];
+	b = context->state[1];
+	c = context->state[2];
+	d = context->state[3];
+	e = context->state[4];
+	f = context->state[5];
+	g = context->state[6];
+	h = context->state[7];
+
+	j = 0;
+	do {
+		ROUND512_0_TO_15(a,b,c,d,e,f,g,h);
+		ROUND512_0_TO_15(h,a,b,c,d,e,f,g);
+		ROUND512_0_TO_15(g,h,a,b,c,d,e,f);
+		ROUND512_0_TO_15(f,g,h,a,b,c,d,e);
+		ROUND512_0_TO_15(e,f,g,h,a,b,c,d);
+		ROUND512_0_TO_15(d,e,f,g,h,a,b,c);
+		ROUND512_0_TO_15(c,d,e,f,g,h,a,b);
+		ROUND512_0_TO_15(b,c,d,e,f,g,h,a);
+	} while (j < 16);
+
+	/* Now for the remaining rounds up to 79: */
+	do {
+		ROUND512(a,b,c,d,e,f,g,h);
+		ROUND512(h,a,b,c,d,e,f,g);
+		ROUND512(g,h,a,b,c,d,e,f);
+		ROUND512(f,g,h,a,b,c,d,e);
+		ROUND512(e,f,g,h,a,b,c,d);
+		ROUND512(d,e,f,g,h,a,b,c);
+		ROUND512(c,d,e,f,g,h,a,b);
+		ROUND512(b,c,d,e,f,g,h,a);
+	} while (j < 80);
+
+	/* Compute the current intermediate hash value */
+	context->state[0] += a;
+	context->state[1] += b;
+	context->state[2] += c;
+	context->state[3] += d;
+	context->state[4] += e;
+	context->state[5] += f;
+	context->state[6] += g;
+	context->state[7] += h;
+
+	/* Clean up */
+	a = b = c = d = e = f = g = h = T1 = 0;
+}
+
+#else /* SHA2_UNROLL_TRANSFORM */
+
+static void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
+	sha2_word64	a, b, c, d, e, f, g, h, s0, s1;
+	sha2_word64	T1, T2, *W512 = (sha2_word64*)context->buffer;
+	int		j;
+
+	/* Initialize registers with the prev. intermediate value */
+	a = context->state[0];
+	b = context->state[1];
+	c = context->state[2];
+	d = context->state[3];
+	e = context->state[4];
+	f = context->state[5];
+	g = context->state[6];
+	h = context->state[7];
+
+	j = 0;
+	do {
+#if BYTE_ORDER == LITTLE_ENDIAN
+		/* Convert TO host byte order */
+		REVERSE64(*data++, W512[j]);
+		/* Apply the SHA-512 compression function to update a..h */
+		T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + W512[j];
+#else /* BYTE_ORDER == LITTLE_ENDIAN */
+		/* Apply the SHA-512 compression function to update a..h with copy */
+		T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + (W512[j] = *data++);
+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+		T2 = Sigma0_512(a) + Maj(a, b, c);
+		h = g;
+		g = f;
+		f = e;
+		e = d + T1;
+		d = c;
+		c = b;
+		b = a;
+		a = T1 + T2;
+
+		j++;
+	} while (j < 16);
+
+	do {
+		/* Part of the message block expansion: */
+		s0 = W512[(j+1)&0x0f];
+		s0 = sigma0_512(s0);
+		s1 = W512[(j+14)&0x0f];
+		s1 =  sigma1_512(s1);
+
+		/* Apply the SHA-512 compression function to update a..h */
+		T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] +
+		     (W512[j&0x0f] += s1 + W512[(j+9)&0x0f] + s0);
+		T2 = Sigma0_512(a) + Maj(a, b, c);
+		h = g;
+		g = f;
+		f = e;
+		e = d + T1;
+		d = c;
+		c = b;
+		b = a;
+		a = T1 + T2;
+
+		j++;
+	} while (j < 80);
+
+	/* Compute the current intermediate hash value */
+	context->state[0] += a;
+	context->state[1] += b;
+	context->state[2] += c;
+	context->state[3] += d;
+	context->state[4] += e;
+	context->state[5] += f;
+	context->state[6] += g;
+	context->state[7] += h;
+
+	/* Clean up */
+	a = b = c = d = e = f = g = h = T1 = T2 = 0;
+}
+
+#endif /* SHA2_UNROLL_TRANSFORM */
+
+void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
+	unsigned int	freespace, usedspace;
+
+	if (len == 0) {
+		/* Calling with no data is valid - we do nothing */
+		return;
+	}
+
+	/* Sanity check: */
+	assert(context != (SHA512_CTX*)0 && data != (sha2_byte*)0);
+
+	usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH;
+	if (usedspace > 0) {
+		/* Calculate how much free space is available in the buffer */
+		freespace = SHA512_BLOCK_LENGTH - usedspace;
+
+		if (len >= freespace) {
+			/* Fill the buffer completely and process it */
+			MEMCPY_BCOPY(&context->buffer[usedspace], data, freespace);
+			ADDINC128(context->bitcount, freespace << 3);
+			len -= freespace;
+			data += freespace;
+			SHA512_Transform(context, (sha2_word64*)context->buffer);
+		} else {
+			/* The buffer is not yet full */
+			MEMCPY_BCOPY(&context->buffer[usedspace], data, len);
+			ADDINC128(context->bitcount, len << 3);
+			/* Clean up: */
+			usedspace = freespace = 0;
+			return;
+		}
+	}
+	while (len >= SHA512_BLOCK_LENGTH) {
+		/* Process as many complete blocks as we can */
+		SHA512_Transform(context, (sha2_word64*)data);
+		ADDINC128(context->bitcount, SHA512_BLOCK_LENGTH << 3);
+		len -= SHA512_BLOCK_LENGTH;
+		data += SHA512_BLOCK_LENGTH;
+	}
+	if (len > 0) {
+		/* There's left-overs, so save 'em */
+		MEMCPY_BCOPY(context->buffer, data, len);
+		ADDINC128(context->bitcount, len << 3);
+	}
+	/* Clean up: */
+	usedspace = freespace = 0;
+}
+
+static void SHA512_Last(SHA512_CTX* context) {
+	unsigned int	usedspace;
+
+	usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH;
+#if BYTE_ORDER == LITTLE_ENDIAN
+	/* Convert FROM host byte order */
+	REVERSE64(context->bitcount[0],context->bitcount[0]);
+	REVERSE64(context->bitcount[1],context->bitcount[1]);
+#endif
+	if (usedspace > 0) {
+		/* Begin padding with a 1 bit: */
+		context->buffer[usedspace++] = 0x80;
+
+		if (usedspace <= SHA512_SHORT_BLOCK_LENGTH) {
+			/* Set-up for the last transform: */
+			MEMSET_BZERO(&context->buffer[usedspace], SHA512_SHORT_BLOCK_LENGTH - usedspace);
+		} else {
+			if (usedspace < SHA512_BLOCK_LENGTH) {
+				MEMSET_BZERO(&context->buffer[usedspace], SHA512_BLOCK_LENGTH - usedspace);
+			}
+			/* Do second-to-last transform: */
+			SHA512_Transform(context, (sha2_word64*)context->buffer);
+
+			/* And set-up for the last transform: */
+			MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH - 2);
+		}
+	} else {
+		/* Prepare for final transform: */
+		MEMSET_BZERO(context->buffer, SHA512_SHORT_BLOCK_LENGTH);
+
+		/* Begin padding with a 1 bit: */
+		*context->buffer = 0x80;
+	}
+	/* Store the length of input data (in bits): */
+	union {
+		sha2_byte* c;
+		sha2_word64* l;
+	} bitcount;
+	bitcount.c = &context->buffer[SHA512_SHORT_BLOCK_LENGTH];
+	bitcount.l[0] = context->bitcount[1];
+	bitcount.l[1] = context->bitcount[0];
+
+	/* Final transform: */
+	SHA512_Transform(context, (sha2_word64*)context->buffer);
+}
+
+void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
+	sha2_word64	*d = (sha2_word64*)digest;
+
+	/* Sanity check: */
+	assert(context != (SHA512_CTX*)0);
+
+	/* If no digest buffer is passed, we don't bother doing this: */
+	if (digest != (sha2_byte*)0) {
+		SHA512_Last(context);
+
+		/* Save the hash data for output: */
+#if BYTE_ORDER == LITTLE_ENDIAN
+		{
+			/* Convert TO host byte order */
+			int	j;
+			for (j = 0; j < 8; j++) {
+				REVERSE64(context->state[j],context->state[j]);
+				*d++ = context->state[j];
+			}
+		}
+#else
+		MEMCPY_BCOPY(d, context->state, SHA512_DIGEST_LENGTH);
+#endif
+	}
+
+	/* Zero out state data */
+	MEMSET_BZERO(context, sizeof(context));
+}
+
+char *SHA512_End(SHA512_CTX* context, char buffer[]) {
+	sha2_byte	digest[SHA512_DIGEST_LENGTH], *d = digest;
+	int		i;
+
+	/* Sanity check: */
+	assert(context != (SHA512_CTX*)0);
+
+	if (buffer != (char*)0) {
+		SHA512_Final(digest, context);
+
+		for (i = 0; i < SHA512_DIGEST_LENGTH; i++) {
+			*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
+			*buffer++ = sha2_hex_digits[*d & 0x0f];
+			d++;
+		}
+		*buffer = (char)0;
+	} else {
+		MEMSET_BZERO(context, sizeof(context));
+	}
+	MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH);
+	return buffer;
+}
+
+char* SHA512_Data(const sha2_byte* data, size_t len, char digest[SHA512_DIGEST_STRING_LENGTH]) {
+	SHA512_CTX	context;
+
+	SHA512_Init(&context);
+	SHA512_Update(&context, data, len);
+	return SHA512_End(&context, digest);
+}
+
+
+/*** SHA-384: *********************************************************/
+void SHA384_Init(SHA384_CTX* context) {
+	if (context == (SHA384_CTX*)0) {
+		return;
+	}
+	MEMCPY_BCOPY(context->state, sha384_initial_hash_value, SHA512_DIGEST_LENGTH);
+	MEMSET_BZERO(context->buffer, SHA384_BLOCK_LENGTH);
+	context->bitcount[0] = context->bitcount[1] = 0;
+}
+
+void SHA384_Update(SHA384_CTX* context, const sha2_byte* data, size_t len) {
+	SHA512_Update((SHA512_CTX*)context, data, len);
+}
+
+void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
+	sha2_word64	*d = (sha2_word64*)digest;
+
+	/* Sanity check: */
+	assert(context != (SHA384_CTX*)0);
+
+	/* If no digest buffer is passed, we don't bother doing this: */
+	if (digest != (sha2_byte*)0) {
+		SHA512_Last((SHA512_CTX*)context);
+
+		/* Save the hash data for output: */
+#if BYTE_ORDER == LITTLE_ENDIAN
+		{
+			/* Convert TO host byte order */
+			int	j;
+			for (j = 0; j < 6; j++) {
+				REVERSE64(context->state[j],context->state[j]);
+				*d++ = context->state[j];
+			}
+		}
+#else
+		MEMCPY_BCOPY(d, context->state, SHA384_DIGEST_LENGTH);
+#endif
+	}
+
+	/* Zero out state data */
+	MEMSET_BZERO(context, sizeof(context));
+}
+
+char *SHA384_End(SHA384_CTX* context, char buffer[]) {
+	sha2_byte	digest[SHA384_DIGEST_LENGTH], *d = digest;
+	int		i;
+
+	/* Sanity check: */
+	assert(context != (SHA384_CTX*)0);
+
+	if (buffer != (char*)0) {
+		SHA384_Final(digest, context);
+
+		for (i = 0; i < SHA384_DIGEST_LENGTH; i++) {
+			*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
+			*buffer++ = sha2_hex_digits[*d & 0x0f];
+			d++;
+		}
+		*buffer = (char)0;
+	} else {
+		MEMSET_BZERO(context, sizeof(context));
+	}
+	MEMSET_BZERO(digest, SHA384_DIGEST_LENGTH);
+	return buffer;
+}
+
+char* SHA384_Data(const sha2_byte* data, size_t len, char digest[SHA384_DIGEST_STRING_LENGTH]) {
+	SHA384_CTX	context;
+
+	SHA384_Init(&context);
+	SHA384_Update(&context, data, len);
+	return SHA384_End(&context, digest);
+}
+
diff --git a/apt-pkg/contrib/sha2_internal.h b/apt-pkg/contrib/sha2_internal.h
new file mode 100644
index 000000000..d9d429c92
--- /dev/null
+++ b/apt-pkg/contrib/sha2_internal.h
@@ -0,0 +1,188 @@
+/*
+ * FILE:	sha2.h
+ * AUTHOR:	Aaron D. Gifford - http://www.aarongifford.com/
+ * 
+ * Copyright (c) 2000-2001, Aaron D. Gifford
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id: sha2.h,v 1.1 2001/11/08 00:02:01 adg Exp adg $
+ */
+
+#ifndef __SHA2_H__
+#define __SHA2_H__
+
+/*
+ * Import u_intXX_t size_t type definitions from system headers.  You
+ * may need to change this, or define these things yourself in this
+ * file.
+ */
+#include <sys/types.h>
+
+#ifdef SHA2_USE_INTTYPES_H
+
+#include <inttypes.h>
+
+#endif /* SHA2_USE_INTTYPES_H */
+
+
+/*** SHA-256/384/512 Various Length Definitions ***********************/
+#define SHA256_BLOCK_LENGTH		64
+#define SHA256_DIGEST_LENGTH		32
+#define SHA256_DIGEST_STRING_LENGTH	(SHA256_DIGEST_LENGTH * 2 + 1)
+#define SHA384_BLOCK_LENGTH		128
+#define SHA384_DIGEST_LENGTH		48
+#define SHA384_DIGEST_STRING_LENGTH	(SHA384_DIGEST_LENGTH * 2 + 1)
+#define SHA512_BLOCK_LENGTH		128
+#define SHA512_DIGEST_LENGTH		64
+#define SHA512_DIGEST_STRING_LENGTH	(SHA512_DIGEST_LENGTH * 2 + 1)
+
+
+/*** SHA-256/384/512 Context Structures *******************************/
+/* NOTE: If your architecture does not define either u_intXX_t types or
+ * uintXX_t (from inttypes.h), you may need to define things by hand
+ * for your system:
+ */
+#if 0
+typedef unsigned char u_int8_t;		/* 1-byte  (8-bits)  */
+typedef unsigned int u_int32_t;		/* 4-bytes (32-bits) */
+typedef unsigned long long u_int64_t;	/* 8-bytes (64-bits) */
+#endif
+/*
+ * Most BSD systems already define u_intXX_t types, as does Linux.
+ * Some systems, however, like Compaq's Tru64 Unix instead can use
+ * uintXX_t types defined by very recent ANSI C standards and included
+ * in the file:
+ *
+ *   #include <inttypes.h>
+ *
+ * If you choose to use <inttypes.h> then please define: 
+ *
+ *   #define SHA2_USE_INTTYPES_H
+ *
+ * Or on the command line during compile:
+ *
+ *   cc -DSHA2_USE_INTTYPES_H ...
+ */
+#ifdef SHA2_USE_INTTYPES_H
+
+typedef struct _SHA256_CTX {
+	uint32_t	state[8];
+	uint64_t	bitcount;
+	uint8_t	buffer[SHA256_BLOCK_LENGTH];
+} SHA256_CTX;
+typedef struct _SHA512_CTX {
+	uint64_t	state[8];
+	uint64_t	bitcount[2];
+	uint8_t	buffer[SHA512_BLOCK_LENGTH];
+} SHA512_CTX;
+
+#else /* SHA2_USE_INTTYPES_H */
+
+typedef struct _SHA256_CTX {
+	u_int32_t	state[8];
+	u_int64_t	bitcount;
+	u_int8_t	buffer[SHA256_BLOCK_LENGTH];
+} SHA256_CTX;
+typedef struct _SHA512_CTX {
+	u_int64_t	state[8];
+	u_int64_t	bitcount[2];
+	u_int8_t	buffer[SHA512_BLOCK_LENGTH];
+} SHA512_CTX;
+
+#endif /* SHA2_USE_INTTYPES_H */
+
+typedef SHA512_CTX SHA384_CTX;
+
+
+/*** SHA-256/384/512 Function Prototypes ******************************/
+#ifndef NOPROTO
+#ifdef SHA2_USE_INTTYPES_H
+
+void SHA256_Init(SHA256_CTX *);
+void SHA256_Update(SHA256_CTX*, const uint8_t*, size_t);
+void SHA256_Final(uint8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*);
+char* SHA256_End(SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH]);
+char* SHA256_Data(const uint8_t*, size_t, char[SHA256_DIGEST_STRING_LENGTH]);
+
+void SHA384_Init(SHA384_CTX*);
+void SHA384_Update(SHA384_CTX*, const uint8_t*, size_t);
+void SHA384_Final(uint8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*);
+char* SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]);
+char* SHA384_Data(const uint8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH]);
+
+void SHA512_Init(SHA512_CTX*);
+void SHA512_Update(SHA512_CTX*, const uint8_t*, size_t);
+void SHA512_Final(uint8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*);
+char* SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]);
+char* SHA512_Data(const uint8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH]);
+
+#else /* SHA2_USE_INTTYPES_H */
+
+void SHA256_Init(SHA256_CTX *);
+void SHA256_Update(SHA256_CTX*, const u_int8_t*, size_t);
+void SHA256_Final(u_int8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*);
+char* SHA256_End(SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH]);
+char* SHA256_Data(const u_int8_t*, size_t, char[SHA256_DIGEST_STRING_LENGTH]);
+
+void SHA384_Init(SHA384_CTX*);
+void SHA384_Update(SHA384_CTX*, const u_int8_t*, size_t);
+void SHA384_Final(u_int8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*);
+char* SHA384_End(SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH]);
+char* SHA384_Data(const u_int8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH]);
+
+void SHA512_Init(SHA512_CTX*);
+void SHA512_Update(SHA512_CTX*, const u_int8_t*, size_t);
+void SHA512_Final(u_int8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*);
+char* SHA512_End(SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH]);
+char* SHA512_Data(const u_int8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH]);
+
+#endif /* SHA2_USE_INTTYPES_H */
+
+#else /* NOPROTO */
+
+void SHA256_Init();
+void SHA256_Update();
+void SHA256_Final();
+char* SHA256_End();
+char* SHA256_Data();
+
+void SHA384_Init();
+void SHA384_Update();
+void SHA384_Final();
+char* SHA384_End();
+char* SHA384_Data();
+
+void SHA512_Init();
+void SHA512_Update();
+void SHA512_Final();
+char* SHA512_End();
+char* SHA512_Data();
+
+#endif /* NOPROTO */
+
+#endif /* __SHA2_H__ */
+
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 8dd05b9c0..99efa8d98 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -15,12 +15,12 @@
    ##################################################################### */
 									/*}}}*/
 // Includes								/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 
-#include <apti18n.h>
-    
 #include <ctype.h>
 #include <string.h>
 #include <stdio.h>
@@ -31,7 +31,7 @@
 #include <stdarg.h>
 #include <iconv.h>
 
-#include "config.h"
+#include <apti18n.h>
 
 using namespace std;
 									/*}}}*/
@@ -910,17 +910,17 @@ bool StrToTime(const string &Val,time_t &Result)
 
    // Handle RFC 1123 time
    Month[0] = 0;
-   if (sscanf(I," %d %3s %d %d:%d:%d GMT",&Tm.tm_mday,Month,&Tm.tm_year,
+   if (sscanf(I," %2d %3s %4d %2d:%2d:%2d GMT",&Tm.tm_mday,Month,&Tm.tm_year,
 	      &Tm.tm_hour,&Tm.tm_min,&Tm.tm_sec) != 6)
    {
       // Handle RFC 1036 time
-      if (sscanf(I," %d-%3s-%d %d:%d:%d GMT",&Tm.tm_mday,Month,
+      if (sscanf(I," %2d-%3s-%3d %2d:%2d:%2d GMT",&Tm.tm_mday,Month,
 		 &Tm.tm_year,&Tm.tm_hour,&Tm.tm_min,&Tm.tm_sec) == 6)
 	 Tm.tm_year += 1900;
       else
       {
 	 // asctime format
-	 if (sscanf(I," %3s %d %d:%d:%d %d",Month,&Tm.tm_mday,
+	 if (sscanf(I," %3s %2d %2d:%2d:%2d %4d",Month,&Tm.tm_mday,
 		    &Tm.tm_hour,&Tm.tm_min,&Tm.tm_sec,&Tm.tm_year) != 6)
 	 {
 	    // 'ftp' time
@@ -969,6 +969,34 @@ bool StrToNum(const char *Str,unsigned long &Res,unsigned Len,unsigned Base)
    return true;
 }
 									/*}}}*/
+// StrToNum - Convert a fixed length string to a number			/*{{{*/
+// ---------------------------------------------------------------------
+/* This is used in decoding the crazy fixed length string headers in 
+   tar and ar files. */
+bool StrToNum(const char *Str,unsigned long long &Res,unsigned Len,unsigned Base)
+{
+   char S[30];
+   if (Len >= sizeof(S))
+      return false;
+   memcpy(S,Str,Len);
+   S[Len] = 0;
+   
+   // All spaces is a zero
+   Res = 0;
+   unsigned I;
+   for (I = 0; S[I] == ' '; I++);
+   if (S[I] == 0)
+      return true;
+   
+   char *End;
+   Res = strtoull(S,&End,Base);
+   if (End == S)
+      return false;
+   
+   return true;
+}
+									/*}}}*/
+
 // Base256ToNum - Convert a fixed length binary to a number             /*{{{*/
 // ---------------------------------------------------------------------
 /* This is used in decoding the 256bit encoded fixed length fields in
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index fba85cf94..337139d5d 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -27,59 +27,62 @@
 
 #include "macros.h"
 
+#ifndef APT_8_CLEANER_HEADERS
 using std::string;
 using std::vector;
 using std::ostream;
+#endif
 
-bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest);
+bool UTF8ToCodeset(const char *codeset, const std::string &orig, std::string *dest);
 char *_strstrip(char *String);
 char *_strtabexpand(char *String,size_t Len);
-bool ParseQuoteWord(const char *&String,string &Res);
-bool ParseCWord(const char *&String,string &Res);
-string QuoteString(const string &Str,const char *Bad);
-string DeQuoteString(const string &Str);
-string DeQuoteString(string::const_iterator const &begin, string::const_iterator const &end);
+bool ParseQuoteWord(const char *&String,std::string &Res);
+bool ParseCWord(const char *&String,std::string &Res);
+std::string QuoteString(const std::string &Str,const char *Bad);
+std::string DeQuoteString(const std::string &Str);
+std::string DeQuoteString(std::string::const_iterator const &begin, std::string::const_iterator const &end);
 
 // unescape (\0XX and \xXX) from a string
-string DeEscapeString(const string &input);
-
-string SizeToStr(double Bytes);
-string TimeToStr(unsigned long Sec);
-string Base64Encode(const string &Str);
-string OutputInDepth(const unsigned long Depth, const char* Separator="  ");
-string URItoFileName(const string &URI);
-string TimeRFC1123(time_t Date);
+std::string DeEscapeString(const std::string &input);
+
+std::string SizeToStr(double Bytes);
+std::string TimeToStr(unsigned long Sec);
+std::string Base64Encode(const std::string &Str);
+std::string OutputInDepth(const unsigned long Depth, const char* Separator="  ");
+std::string URItoFileName(const std::string &URI);
+std::string TimeRFC1123(time_t Date);
 bool RFC1123StrToTime(const char* const str,time_t &time) __must_check;
 bool FTPMDTMStrToTime(const char* const str,time_t &time) __must_check;
-__deprecated bool StrToTime(const string &Val,time_t &Result);
-string LookupTag(const string &Message,const char *Tag,const char *Default = 0);
-int StringToBool(const string &Text,int Default = -1);
-bool ReadMessages(int Fd, vector<string> &List);
+__deprecated bool StrToTime(const std::string &Val,time_t &Result);
+std::string LookupTag(const std::string &Message,const char *Tag,const char *Default = 0);
+int StringToBool(const std::string &Text,int Default = -1);
+bool ReadMessages(int Fd, std::vector<std::string> &List);
 bool StrToNum(const char *Str,unsigned long &Res,unsigned Len,unsigned Base = 0);
+bool StrToNum(const char *Str,unsigned long long &Res,unsigned Len,unsigned Base = 0);
 bool Base256ToNum(const char *Str,unsigned long &Res,unsigned int Len);
-bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length);
+bool Hex2Num(const std::string &Str,unsigned char *Num,unsigned int Length);
 bool TokSplitString(char Tok,char *Input,char **List,
 		    unsigned long ListMax);
-vector<string> VectorizeString(string const &haystack, char const &split) __attrib_const;
-void ioprintf(ostream &out,const char *format,...) __like_printf(2);
-void strprintf(string &out,const char *format,...) __like_printf(2);
+std::vector<std::string> VectorizeString(std::string const &haystack, char const &split) __attrib_const;
+void ioprintf(std::ostream &out,const char *format,...) __like_printf(2);
+void strprintf(std::string &out,const char *format,...) __like_printf(2);
 char *safe_snprintf(char *Buffer,char *End,const char *Format,...) __like_printf(3);
-bool CheckDomainList(const string &Host, const string &List);
+bool CheckDomainList(const std::string &Host, const std::string &List);
 int tolower_ascii(int const c) __attrib_const __hot;
-string StripEpoch(const string &VerStr);
+std::string StripEpoch(const std::string &VerStr);
 
 #define APT_MKSTRCMP(name,func) \
 inline int name(const char *A,const char *B) {return func(A,A+strlen(A),B,B+strlen(B));}; \
 inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));}; \
-inline int name(const string& A,const char *B) {return func(A.c_str(),A.c_str()+A.length(),B,B+strlen(B));}; \
-inline int name(const string& A,const string& B) {return func(A.c_str(),A.c_str()+A.length(),B.c_str(),B.c_str()+B.length());}; \
-inline int name(const string& A,const char *B,const char *BEnd) {return func(A.c_str(),A.c_str()+A.length(),B,BEnd);};
+inline int name(const std::string& A,const char *B) {return func(A.c_str(),A.c_str()+A.length(),B,B+strlen(B));}; \
+inline int name(const std::string& A,const std::string& B) {return func(A.c_str(),A.c_str()+A.length(),B.c_str(),B.c_str()+B.length());}; \
+inline int name(const std::string& A,const char *B,const char *BEnd) {return func(A.c_str(),A.c_str()+A.length(),B,BEnd);};
 
 #define APT_MKSTRCMP2(name,func) \
 inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));}; \
-inline int name(const string& A,const char *B) {return func(A.begin(),A.end(),B,B+strlen(B));}; \
-inline int name(const string& A,const string& B) {return func(A.begin(),A.end(),B.begin(),B.end());}; \
-inline int name(const string& A,const char *B,const char *BEnd) {return func(A.begin(),A.end(),B,BEnd);};
+inline int name(const std::string& A,const char *B) {return func(A.begin(),A.end(),B,B+strlen(B));}; \
+inline int name(const std::string& A,const std::string& B) {return func(A.begin(),A.end(),B.begin(),B.end());}; \
+inline int name(const std::string& A,const char *B,const char *BEnd) {return func(A.begin(),A.end(),B,BEnd);};
 
 int stringcmp(const char *A,const char *AEnd,const char *B,const char *BEnd);
 int stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd);
@@ -88,17 +91,17 @@ int stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd)
    case the definition of string::const_iterator is not the same as
    const char * and we need these extra functions */
 #if __GNUC__ >= 3
-int stringcmp(string::const_iterator A,string::const_iterator AEnd,
+int stringcmp(std::string::const_iterator A,std::string::const_iterator AEnd,
 	      const char *B,const char *BEnd);
-int stringcmp(string::const_iterator A,string::const_iterator AEnd,
-	      string::const_iterator B,string::const_iterator BEnd);
-int stringcasecmp(string::const_iterator A,string::const_iterator AEnd,
+int stringcmp(std::string::const_iterator A,std::string::const_iterator AEnd,
+	      std::string::const_iterator B,std::string::const_iterator BEnd);
+int stringcasecmp(std::string::const_iterator A,std::string::const_iterator AEnd,
 		  const char *B,const char *BEnd);
-int stringcasecmp(string::const_iterator A,string::const_iterator AEnd,
-                  string::const_iterator B,string::const_iterator BEnd);
+int stringcasecmp(std::string::const_iterator A,std::string::const_iterator AEnd,
+                  std::string::const_iterator B,std::string::const_iterator BEnd);
 
-inline int stringcmp(string::const_iterator A,string::const_iterator Aend,const char *B) {return stringcmp(A,Aend,B,B+strlen(B));};
-inline int stringcasecmp(string::const_iterator A,string::const_iterator Aend,const char *B) {return stringcasecmp(A,Aend,B,B+strlen(B));};
+inline int stringcmp(std::string::const_iterator A,std::string::const_iterator Aend,const char *B) {return stringcmp(A,Aend,B,B+strlen(B));};
+inline int stringcasecmp(std::string::const_iterator A,std::string::const_iterator Aend,const char *B) {return stringcasecmp(A,Aend,B,B+strlen(B));};
 #endif
 
 APT_MKSTRCMP2(stringcmp,stringcmp);
@@ -108,34 +111,34 @@ inline const char *DeNull(const char *s) {return (s == 0?"(null)":s);};
 
 class URI
 {
-   void CopyFrom(const string &From);
+   void CopyFrom(const std::string &From);
 		 
    public:
    
-   string Access;
-   string User;
-   string Password;
-   string Host;
-   string Path;
+   std::string Access;
+   std::string User;
+   std::string Password;
+   std::string Host;
+   std::string Path;
    unsigned int Port;
    
-   operator string();
-   inline void operator =(const string &From) {CopyFrom(From);};
+   operator std::string();
+   inline void operator =(const std::string &From) {CopyFrom(From);};
    inline bool empty() {return Access.empty();};
-   static string SiteOnly(const string &URI);
-   static string NoUserPassword(const string &URI);
+   static std::string SiteOnly(const std::string &URI);
+   static std::string NoUserPassword(const std::string &URI);
    
-   URI(string Path) {CopyFrom(Path);};
+   URI(std::string Path) {CopyFrom(Path);};
    URI() : Port(0) {};
 };
 
 struct SubstVar
 {
    const char *Subst;
-   const string *Contents;
+   const std::string *Contents;
 };
-string SubstVar(string Str,const struct SubstVar *Vars);
-string SubstVar(const string &Str,const string &Subst,const string &Contents);
+std::string SubstVar(std::string Str,const struct SubstVar *Vars);
+std::string SubstVar(const std::string &Str,const std::string &Subst,const std::string &Contents);
 
 struct RxChoiceList
 {
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index e3d4063dc..5dc2a2ac2 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -9,6 +9,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/debindexfile.h>
 #include <apt-pkg/debsrcrecords.h>
 #include <apt-pkg/deblistparser.h>
@@ -24,6 +26,8 @@
 #include <sys/stat.h>
 									/*}}}*/
 
+using std::string;
+
 // SourcesIndex::debSourcesIndex - Constructor				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -157,7 +161,7 @@ unsigned long debSourcesIndex::Size() const
    /* we need to ignore errors here; if the lists are absent, just return 0 */
    _error->PushToStack();
 
-   FileFd f = FileFd (IndexFile("Sources"), FileFd::ReadOnlyGzip);
+   FileFd f = FileFd (IndexFile("Sources"), FileFd::ReadOnly, FileFd::Extension);
    if (!f.Failed())
       size = f.Size();
 
@@ -286,7 +290,7 @@ unsigned long debPackagesIndex::Size() const
    /* we need to ignore errors here; if the lists are absent, just return 0 */
    _error->PushToStack();
 
-   FileFd f = FileFd (IndexFile("Packages"), FileFd::ReadOnlyGzip);
+   FileFd f = FileFd (IndexFile("Packages"), FileFd::ReadOnly, FileFd::Extension);
    if (!f.Failed())
       size = f.Size();
 
@@ -303,7 +307,7 @@ unsigned long debPackagesIndex::Size() const
 bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 {
    string PackageFile = IndexFile("Packages");
-   FileFd Pkg(PackageFile,FileFd::ReadOnlyGzip);
+   FileFd Pkg(PackageFile,FileFd::ReadOnly, FileFd::Extension);
    debListParser Parser(&Pkg, Architecture);
 
    if (_error->PendingError() == true)
@@ -317,11 +321,8 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
    // Store the IMS information
    pkgCache::PkgFileIterator File = Gen.GetCurFile();
    pkgCacheGenerator::Dynamic<pkgCache::PkgFileIterator> DynFile(File);
-   struct stat St;
-   if (fstat(Pkg.Fd(),&St) != 0)
-      return _error->Errno("fstat","Failed to stat");
-   File->Size = St.st_size;
-   File->mtime = St.st_mtime;
+   File->Size = Pkg.FileSize();
+   File->mtime = Pkg.ModificationTime();
    
    if (Gen.MergeList(Parser) == false)
       return _error->Error("Problem with MergeList %s",PackageFile.c_str());
@@ -487,7 +488,7 @@ unsigned long debTranslationsIndex::Size() const
    /* we need to ignore errors here; if the lists are absent, just return 0 */
    _error->PushToStack();
 
-   FileFd f = FileFd (IndexFile(Language), FileFd::ReadOnlyGzip);
+   FileFd f = FileFd (IndexFile(Language), FileFd::ReadOnly, FileFd::Extension);
    if (!f.Failed())
       size = f.Size();
 
@@ -507,7 +508,7 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
    string TranslationFile = IndexFile(Language);
    if (FileExists(TranslationFile))
    {
-     FileFd Trans(TranslationFile,FileFd::ReadOnlyGzip);
+     FileFd Trans(TranslationFile,FileFd::ReadOnly, FileFd::Extension);
      debListParser TransParser(&Trans);
      if (_error->PendingError() == true)
        return false;
@@ -519,11 +520,8 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 
      // Store the IMS information
      pkgCache::PkgFileIterator TransFile = Gen.GetCurFile();
-     struct stat TransSt;
-     if (fstat(Trans.Fd(),&TransSt) != 0)
-       return _error->Errno("fstat","Failed to stat");
-     TransFile->Size = TransSt.st_size;
-     TransFile->mtime = TransSt.st_mtime;
+     TransFile->Size = Trans.FileSize();
+     TransFile->mtime = Trans.ModificationTime();
    
      if (Gen.MergeList(TransParser) == false)
        return _error->Error("Problem with MergeList %s",TranslationFile.c_str());
@@ -588,7 +586,7 @@ unsigned long debStatusIndex::Size() const
 /* */
 bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 {
-   FileFd Pkg(File,FileFd::ReadOnlyGzip);
+   FileFd Pkg(File,FileFd::ReadOnly, FileFd::Extension);
    if (_error->PendingError() == true)
       return false;
    debListParser Parser(&Pkg);
@@ -602,11 +600,8 @@ bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 
    // Store the IMS information
    pkgCache::PkgFileIterator CFile = Gen.GetCurFile();
-   struct stat St;
-   if (fstat(Pkg.Fd(),&St) != 0)
-      return _error->Errno("fstat","Failed to stat");
-   CFile->Size = St.st_size;
-   CFile->mtime = St.st_mtime;
+   CFile->Size = Pkg.FileSize();
+   CFile->mtime = Pkg.ModificationTime();
    CFile->Archive = Gen.WriteUniqString("now");
    
    if (Gen.MergeList(Parser) == false)
diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index b5085992d..9e64d4476 100644
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -22,46 +22,55 @@
 
 class debStatusIndex : public pkgIndexFile
 {
-   string File;
-   
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+
+   protected:
+   std::string File;
+
    public:
 
    virtual const Type *GetType() const;
    
    // Interface for acquire
-   virtual string Describe(bool Short) const {return File;};
+   virtual std::string Describe(bool Short) const {return File;};
    
    // Interface for the Cache Generator
    virtual bool Exists() const;
    virtual bool HasPackages() const {return true;};
    virtual unsigned long Size() const;
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
+   bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog, unsigned long const Flag) const;
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
-   debStatusIndex(string File);
+   debStatusIndex(std::string File);
+   virtual ~debStatusIndex() {};
 };
     
 class debPackagesIndex : public pkgIndexFile
 {
-   string URI;
-   string Dist;
-   string Section;
-   string Architecture;
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
 
-   string Info(const char *Type) const;
-   string IndexFile(const char *Type) const;
-   string IndexURI(const char *Type) const;
+   std::string URI;
+   std::string Dist;
+   std::string Section;
+   std::string Architecture;
+
+   std::string Info(const char *Type) const;
+   std::string IndexFile(const char *Type) const;
+   std::string IndexURI(const char *Type) const;
    
    public:
    
    virtual const Type *GetType() const;
 
    // Stuff for accessing files on remote items
-   virtual string ArchiveInfo(pkgCache::VerIterator Ver) const;
-   virtual string ArchiveURI(string File) const {return URI + File;};
+   virtual std::string ArchiveInfo(pkgCache::VerIterator Ver) const;
+   virtual std::string ArchiveURI(std::string File) const {return URI + File;};
    
    // Interface for acquire
-   virtual string Describe(bool Short) const;   
+   virtual std::string Describe(bool Short) const;   
    
    // Interface for the Cache Generator
    virtual bool Exists() const;
@@ -70,29 +79,33 @@ class debPackagesIndex : public pkgIndexFile
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
-   debPackagesIndex(string const &URI, string const &Dist, string const &Section,
-			bool const &Trusted, string const &Arch = "native");
+   debPackagesIndex(std::string const &URI, std::string const &Dist, std::string const &Section,
+			bool const &Trusted, std::string const &Arch = "native");
+   virtual ~debPackagesIndex() {};
 };
 
 class debTranslationsIndex : public pkgIndexFile
 {
-   string URI;
-   string Dist;
-   string Section;
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+
+   std::string URI;
+   std::string Dist;
+   std::string Section;
    const char * const Language;
    
-   string Info(const char *Type) const;
-   string IndexFile(const char *Type) const;
-   string IndexURI(const char *Type) const;
+   std::string Info(const char *Type) const;
+   std::string IndexFile(const char *Type) const;
+   std::string IndexURI(const char *Type) const;
 
-   inline string TranslationFile() const {return string("Translation-").append(Language);};
+   inline std::string TranslationFile() const {return std::string("Translation-").append(Language);};
 
    public:
    
    virtual const Type *GetType() const;
 
    // Interface for acquire
-   virtual string Describe(bool Short) const;   
+   virtual std::string Describe(bool Short) const;   
    virtual bool GetIndexes(pkgAcquire *Owner) const;
    
    // Interface for the Cache Generator
@@ -102,30 +115,34 @@ class debTranslationsIndex : public pkgIndexFile
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
 
-   debTranslationsIndex(string URI,string Dist,string Section, char const * const Language);
+   debTranslationsIndex(std::string URI,std::string Dist,std::string Section, char const * const Language);
+   virtual ~debTranslationsIndex() {};
 };
 
 class debSourcesIndex : public pkgIndexFile
 {
-   string URI;
-   string Dist;
-   string Section;
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+
+   std::string URI;
+   std::string Dist;
+   std::string Section;
 
-   string Info(const char *Type) const;
-   string IndexFile(const char *Type) const;
-   string IndexURI(const char *Type) const;
+   std::string Info(const char *Type) const;
+   std::string IndexFile(const char *Type) const;
+   std::string IndexURI(const char *Type) const;
    
    public:
 
    virtual const Type *GetType() const;
 
    // Stuff for accessing files on remote items
-   virtual string SourceInfo(pkgSrcRecords::Parser const &Record,
+   virtual std::string SourceInfo(pkgSrcRecords::Parser const &Record,
 			     pkgSrcRecords::File const &File) const;
-   virtual string ArchiveURI(string File) const {return URI + File;};
+   virtual std::string ArchiveURI(std::string File) const {return URI + File;};
    
    // Interface for acquire
-   virtual string Describe(bool Short) const;   
+   virtual std::string Describe(bool Short) const;   
 
    // Interface for the record parsers
    virtual pkgSrcRecords::Parser *CreateSrcParser() const;
@@ -135,7 +152,8 @@ class debSourcesIndex : public pkgIndexFile
    virtual bool HasPackages() const {return false;};
    virtual unsigned long Size() const;
    
-   debSourcesIndex(string URI,string Dist,string Section,bool Trusted);
+   debSourcesIndex(std::string URI,std::string Dist,std::string Section,bool Trusted);
+   virtual ~debSourcesIndex() {};
 };
 
 #endif
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 0562be44c..84e6c38c5 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -10,11 +10,14 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
 #include <apt-pkg/crc-16.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/macros.h>
@@ -23,6 +26,8 @@
 #include <ctype.h>
 									/*}}}*/
 
+using std::string;
+
 static debListParser::WordList PrioList[] = {{"important",pkgCache::State::Important},
                        {"required",pkgCache::State::Required},
                        {"standard",pkgCache::State::Standard},
@@ -69,10 +74,7 @@ string debListParser::Package() {
 // ---------------------------------------------------------------------
 /* This will return the Architecture of the package this section describes */
 string debListParser::Architecture() {
-   std::string const Arch = Section.FindS("Architecture");
-   if (Arch.empty() == true)
-      return _config->Find("APT::Architecture");
-   return Arch;
+   return Section.FindS("Architecture");
 }
 									/*}}}*/
 // ListParser::ArchitectureAll						/*{{{*/
@@ -128,12 +130,7 @@ bool debListParser::NewVersion(pkgCache::VerIterator &Ver)
    }
 
    if (ArchitectureAll() == true)
-      switch (Ver->MultiArch)
-      {
-	 case pkgCache::Version::Foreign: Ver->MultiArch = pkgCache::Version::AllForeign; break;
-	 case pkgCache::Version::Allowed: Ver->MultiArch = pkgCache::Version::AllAllowed; break;
-	 default: Ver->MultiArch = pkgCache::Version::All;
-      }
+      Ver->MultiArch |= pkgCache::Version::All;
 
    // Archive Size
    Ver->Size = Section.FindULL("Size");
@@ -252,7 +249,7 @@ bool debListParser::UsePackage(pkgCache::PkgIterator &Pkg,
       return false;
 
    if (strcmp(Pkg.Name(),"apt") == 0)
-      Pkg->Flags |= pkgCache::Flag::Important;
+      Pkg->Flags |= pkgCache::Flag::Essential | pkgCache::Flag::Important;
    
    if (ParseStatus(Pkg,Ver) == false)
       return false;
@@ -678,6 +675,9 @@ bool debListParser::ParseProvides(pkgCache::VerIterator &Ver)
 	    return _error->Error("Problem parsing Provides line");
 	 if (Op != pkgCache::Dep::NoOp) {
 	    _error->Warning("Ignoring Provides line with DepCompareOp for package %s", Package.c_str());
+	 } else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign) {
+	    if (NewProvidesAllArch(Ver, Package, Version) == false)
+	       return false;
 	 } else {
 	    if (NewProvides(Ver, Package, Arch, Version) == false)
 	       return false;
@@ -690,12 +690,12 @@ bool debListParser::ParseProvides(pkgCache::VerIterator &Ver)
 
    if (MultiArchEnabled == false)
       return true;
-   else if (Ver->MultiArch == pkgCache::Version::Allowed || Ver->MultiArch == pkgCache::Version::AllAllowed)
+   else if ((Ver->MultiArch & pkgCache::Version::Allowed) == pkgCache::Version::Allowed)
    {
       string const Package = string(Ver.ParentPkg().Name()).append(":").append("any");
       return NewProvidesAllArch(Ver, Package, Ver.VerStr());
    }
-   else if (Ver->MultiArch == pkgCache::Version::Foreign || Ver->MultiArch == pkgCache::Version::AllForeign)
+   else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign)
       return NewProvidesAllArch(Ver, Ver.ParentPkg().Name(), Ver.VerStr());
 
    return true;
@@ -773,6 +773,7 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,
    // file. to provide Component pinning we use the section name now
    FileI->Component = WriteUniqString(component);
 
+   // FIXME: Code depends on the fact that Release files aren't compressed
    FILE* release = fdopen(dup(File.Fd()), "r");
    if (release == NULL)
       return false;
@@ -816,16 +817,16 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,
       ++lineEnd;
 
       // which datastorage need to be updated
-      map_ptrloc* writeTo = NULL;
+      enum { Suite, Component, Version, Origin, Codename, Label, None } writeTo = None;
       if (buffer[0] == ' ')
 	 ;
-      #define APT_PARSER_WRITETO(X, Y) else if (strncmp(Y, buffer, len) == 0) writeTo = &X;
-      APT_PARSER_WRITETO(FileI->Archive, "Suite")
-      APT_PARSER_WRITETO(FileI->Component, "Component")
-      APT_PARSER_WRITETO(FileI->Version, "Version")
-      APT_PARSER_WRITETO(FileI->Origin, "Origin")
-      APT_PARSER_WRITETO(FileI->Codename, "Codename")
-      APT_PARSER_WRITETO(FileI->Label, "Label")
+      #define APT_PARSER_WRITETO(X) else if (strncmp(#X, buffer, len) == 0) writeTo = X;
+      APT_PARSER_WRITETO(Suite)
+      APT_PARSER_WRITETO(Component)
+      APT_PARSER_WRITETO(Version)
+      APT_PARSER_WRITETO(Origin)
+      APT_PARSER_WRITETO(Codename)
+      APT_PARSER_WRITETO(Label)
       #undef APT_PARSER_WRITETO
       #define APT_PARSER_FLAGIT(X) else if (strncmp(#X, buffer, len) == 0) \
 	 pkgTagSection::FindFlag(FileI->Flags, pkgCache::Flag:: X, dataStart, lineEnd);
@@ -835,19 +836,19 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,
 
       // load all data from the line and save it
       string data;
-      if (writeTo != NULL)
+      if (writeTo != None)
 	 data.append(dataStart, dataEnd);
       if (sizeof(buffer) - 1 == (dataEnd - buffer))
       {
 	 while (fgets(buffer, sizeof(buffer), release) != NULL)
 	 {
-	    if (writeTo != NULL)
+	    if (writeTo != None)
 	       data.append(buffer);
 	    if (strlen(buffer) != sizeof(buffer) - 1)
 	       break;
 	 }
       }
-      if (writeTo != NULL)
+      if (writeTo != None)
       {
 	 // remove spaces and stuff from the end of the data line
 	 for (std::string::reverse_iterator s = data.rbegin();
@@ -857,7 +858,15 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,
 	       break;
 	    *s = '\0';
 	 }
-	 *writeTo = WriteUniqString(data);
+	 switch (writeTo) {
+	 case Suite: FileI->Archive = WriteUniqString(data); break;
+	 case Component: FileI->Component = WriteUniqString(data); break;
+	 case Version: FileI->Version = WriteUniqString(data); break;
+	 case Origin: FileI->Origin = WriteUniqString(data); break;
+	 case Codename: FileI->Codename = WriteUniqString(data); break;
+	 case Label: FileI->Label = WriteUniqString(data); break;
+	 case None: break;
+	 }
       }
    }
    fclose(release);
diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index d62ce641c..386d291a2 100644
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -12,9 +12,12 @@
 #define PKGLIB_DEBLISTPARSER_H
 
 #include <apt-pkg/pkgcachegen.h>
-#include <apt-pkg/indexfile.h>
 #include <apt-pkg/tagfile.h>
 
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/indexfile.h>
+#endif
+
 class debListParser : public pkgCacheGenerator::ListParser
 {
    public:
@@ -25,36 +28,39 @@ class debListParser : public pkgCacheGenerator::ListParser
       const char *Str;
       unsigned char Val;
    };
-   
+
    private:
-   
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+
+   protected:
    pkgTagFile Tags;
    pkgTagSection Section;
    unsigned long iOffset;
-   string Arch;
+   std::string Arch;
    std::vector<std::string> Architectures;
    bool MultiArchEnabled;
 
    unsigned long UniqFindTagWrite(const char *Tag);
-   bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
+   virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
    bool ParseDepends(pkgCache::VerIterator &Ver,const char *Tag,
 		     unsigned int Type);
    bool ParseProvides(pkgCache::VerIterator &Ver);
-   bool NewProvidesAllArch(pkgCache::VerIterator &Ver, string const &Package, string const &Version);
-   static bool GrabWord(string Word,WordList *List,unsigned char &Out);
+   bool NewProvidesAllArch(pkgCache::VerIterator &Ver, std::string const &Package, std::string const &Version);
+   static bool GrabWord(std::string Word,WordList *List,unsigned char &Out);
    
    public:
 
-   static unsigned char GetPrio(string Str);
+   static unsigned char GetPrio(std::string Str);
       
    // These all operate against the current section
-   virtual string Package();
-   virtual string Architecture();
+   virtual std::string Package();
+   virtual std::string Architecture();
    virtual bool ArchitectureAll();
-   virtual string Version();
+   virtual std::string Version();
    virtual bool NewVersion(pkgCache::VerIterator &Ver);
-   virtual string Description();
-   virtual string DescriptionLanguage();
+   virtual std::string Description();
+   virtual std::string DescriptionLanguage();
    virtual MD5SumValue Description_md5();
    virtual unsigned short VersionHash();
    virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
@@ -65,15 +71,16 @@ class debListParser : public pkgCacheGenerator::ListParser
    virtual bool Step();
    
    bool LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,FileFd &File,
-			string section);
+			std::string section);
    
    static const char *ParseDepends(const char *Start,const char *Stop,
-			    string &Package,string &Ver,unsigned int &Op,
+			    std::string &Package,std::string &Ver,unsigned int &Op,
 			    bool const &ParseArchFlags = false,
 			    bool const &StripMultiArch = true);
    static const char *ConvertRelation(const char *I,unsigned int &Op);
 
-   debListParser(FileFd *File, string const &Arch = "");
+   debListParser(FileFd *File, std::string const &Arch = "");
+   virtual ~debListParser() {};
 };
 
 #endif
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 22effdc8f..bcc617da7 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -1,11 +1,15 @@
 // ijones, walters
+#include <config.h>
 
 #include <apt-pkg/debmetaindex.h>
 #include <apt-pkg/debindexfile.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/indexrecords.h>
+#include <apt-pkg/sourcelist.h>
 #include <apt-pkg/error.h>
 
 #include <set>
@@ -124,7 +128,7 @@ string debReleaseIndex::TranslationIndexURISuffix(const char *Type, const string
 {
    string Res ="";
    if (Dist[Dist.size() - 1] != '/')
-      Res += Section + "/i18n/";
+      Res += Section + "/i18n/Translation-";
    return Res + Type;
 }
 
@@ -143,11 +147,13 @@ string debReleaseIndex::TranslationIndexURI(const char *Type, const string &Sect
       return URI + "dists/" + Dist + "/" + TranslationIndexURISuffix(Type, Section);
 }
 
-debReleaseIndex::debReleaseIndex(string const &URI, string const &Dist) {
-	this->URI = URI;
-	this->Dist = Dist;
-	this->Indexes = NULL;
-	this->Type = "deb";
+debReleaseIndex::debReleaseIndex(string const &URI, string const &Dist) :
+					metaIndex(URI, Dist, "deb"), Trusted(CHECK_TRUST)
+{}
+
+debReleaseIndex::debReleaseIndex(string const &URI, string const &Dist, bool const Trusted) :
+					metaIndex(URI, Dist, "deb") {
+	SetTrusted(Trusted);
 }
 
 debReleaseIndex::~debReleaseIndex() {
@@ -204,31 +210,17 @@ vector <struct IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const {
 	if (lang.empty() == true)
 		return IndexTargets;
 
-	// get the Translations:
-	// - if its a dists-style repository get the i18n/Index first
-	// - if its flat try to acquire files by guessing
-	if (Dist[Dist.size() - 1] == '/') {
-		for (std::set<std::string>::const_iterator s = sections.begin();
-		     s != sections.end(); ++s) {
-			for (std::vector<std::string>::const_iterator l = lang.begin();
-			     l != lang.end(); ++l) {
-				IndexTarget * Target = new OptionalIndexTarget();
-				Target->ShortDesc = "Translation-" + *l;
-				Target->MetaKey = TranslationIndexURISuffix(l->c_str(), *s);
-				Target->URI = TranslationIndexURI(l->c_str(), *s);
-				Target->Description = Info (Target->ShortDesc.c_str(), *s);
-				IndexTargets->push_back(Target);
-			}
-		}
-	} else {
-		for (std::set<std::string>::const_iterator s = sections.begin();
-		     s != sections.end(); ++s) {
+	// get the Translation-* files, later we will skip download of non-existent if we have an index
+	for (std::set<std::string>::const_iterator s = sections.begin();
+	     s != sections.end(); ++s) {
+		for (std::vector<std::string>::const_iterator l = lang.begin();
+		     l != lang.end(); ++l) {
 			IndexTarget * Target = new OptionalIndexTarget();
-			Target->ShortDesc = "TranslationIndex";
-			Target->MetaKey = TranslationIndexURISuffix("Index", *s);
-			Target->URI = TranslationIndexURI("Index", *s);
+			Target->ShortDesc = "Translation-" + *l;
+			Target->MetaKey = TranslationIndexURISuffix(l->c_str(), *s);
+			Target->URI = TranslationIndexURI(l->c_str(), *s);
 			Target->Description = Info (Target->ShortDesc.c_str(), *s);
-			IndexTargets->push_back (Target);
+			IndexTargets->push_back(Target);
 		}
 	}
 
@@ -256,8 +248,22 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const
 	return true;
 }
 
+void debReleaseIndex::SetTrusted(bool const Trusted)
+{
+	if (Trusted == true)
+		this->Trusted = ALWAYS_TRUSTED;
+	else
+		this->Trusted = NEVER_TRUSTED;
+}
+
 bool debReleaseIndex::IsTrusted() const
 {
+   if (Trusted == ALWAYS_TRUSTED)
+      return true;
+   else if (Trusted == NEVER_TRUSTED)
+      return false;
+
+
    if(_config->FindB("APT::Authentication::TrustCDROM", false))
       if(URI.substr(0,strlen("cdrom:")) == "cdrom:")
 	 return true;
@@ -353,6 +359,7 @@ class debSLTypeDebian : public pkgSourceList::Type
       vector<string> const Archs =
 		(arch != Options.end()) ? VectorizeString(arch->second, ',') :
 				APT::Configuration::getArchitectures();
+      map<string, string>::const_iterator const trusted = Options.find("trusted");
 
       for (vector<metaIndex *>::const_iterator I = List.begin();
 	   I != List.end(); ++I)
@@ -362,6 +369,9 @@ class debSLTypeDebian : public pkgSourceList::Type
 	    continue;
 
 	 debReleaseIndex *Deb = (debReleaseIndex *) (*I);
+	 if (trusted != Options.end())
+	    Deb->SetTrusted(StringToBool(trusted->second, false));
+
 	 /* This check insures that there will be only one Release file
 	    queued for all the Packages files and Sources files it
 	    corresponds to. */
@@ -379,9 +389,14 @@ class debSLTypeDebian : public pkgSourceList::Type
 	    return true;
 	 }
       }
+
       // No currently created Release file indexes this entry, so we create a new one.
-      // XXX determine whether this release is trusted or not
-      debReleaseIndex *Deb = new debReleaseIndex(URI, Dist);
+      debReleaseIndex *Deb;
+      if (trusted != Options.end())
+	 Deb = new debReleaseIndex(URI, Dist, StringToBool(trusted->second, false));
+      else
+	 Deb = new debReleaseIndex(URI, Dist);
+
       if (IsSrc == true)
 	 Deb->PushSectionEntry ("source", new debReleaseIndex::debSectionEntry(Section, IsSrc));
       else
diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index 1561c6e00..b9ecab97c 100644
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -3,9 +3,14 @@
 #define PKGLIB_DEBMETAINDEX_H
 
 #include <apt-pkg/metaindex.h>
-#include <apt-pkg/sourcelist.h>
 
 #include <map>
+#include <string>
+#include <vector>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/sourcelist.h>
+#endif
 
 class debReleaseIndex : public metaIndex {
    public:
@@ -13,38 +18,43 @@ class debReleaseIndex : public metaIndex {
    class debSectionEntry
    {
       public:
-      debSectionEntry (string const &Section, bool const &IsSrc);
-      string const Section;
+      debSectionEntry (std::string const &Section, bool const &IsSrc);
+      std::string const Section;
       bool const IsSrc;
    };
 
    private:
-   std::map<string, vector<debSectionEntry const*> > ArchEntries;
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+   std::map<std::string, std::vector<debSectionEntry const*> > ArchEntries;
+   enum { ALWAYS_TRUSTED, NEVER_TRUSTED, CHECK_TRUST } Trusted;
 
    public:
 
-   debReleaseIndex(string const &URI, string const &Dist);
-   ~debReleaseIndex();
+   debReleaseIndex(std::string const &URI, std::string const &Dist);
+   debReleaseIndex(std::string const &URI, std::string const &Dist, bool const Trusted);
+   virtual ~debReleaseIndex();
 
-   virtual string ArchiveURI(string const &File) const {return URI + File;};
+   virtual std::string ArchiveURI(std::string const &File) const {return URI + File;};
    virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) const;
-   vector <struct IndexTarget *>* ComputeIndexTargets() const;
-   string Info(const char *Type, string const &Section, string const &Arch="") const;
-   string MetaIndexInfo(const char *Type) const;
-   string MetaIndexFile(const char *Types) const;
-   string MetaIndexURI(const char *Type) const;
-   string IndexURI(const char *Type, string const &Section, string const &Arch="native") const;
-   string IndexURISuffix(const char *Type, string const &Section, string const &Arch="native") const;
-   string SourceIndexURI(const char *Type, const string &Section) const;
-   string SourceIndexURISuffix(const char *Type, const string &Section) const;
-   string TranslationIndexURI(const char *Type, const string &Section) const;
-   string TranslationIndexURISuffix(const char *Type, const string &Section) const;
-   virtual vector <pkgIndexFile *> *GetIndexFiles();
-
+   std::vector <struct IndexTarget *>* ComputeIndexTargets() const;
+   std::string Info(const char *Type, std::string const &Section, std::string const &Arch="") const;
+   std::string MetaIndexInfo(const char *Type) const;
+   std::string MetaIndexFile(const char *Types) const;
+   std::string MetaIndexURI(const char *Type) const;
+   std::string IndexURI(const char *Type, std::string const &Section, std::string const &Arch="native") const;
+   std::string IndexURISuffix(const char *Type, std::string const &Section, std::string const &Arch="native") const;
+   std::string SourceIndexURI(const char *Type, const std::string &Section) const;
+   std::string SourceIndexURISuffix(const char *Type, const std::string &Section) const;
+   std::string TranslationIndexURI(const char *Type, const std::string &Section) const;
+   std::string TranslationIndexURISuffix(const char *Type, const std::string &Section) const;
+   virtual std::vector <pkgIndexFile *> *GetIndexFiles();
+
+   void SetTrusted(bool const Trusted);
    virtual bool IsTrusted() const;
 
-   void PushSectionEntry(vector<string> const &Archs, const debSectionEntry *Entry);
-   void PushSectionEntry(string const &Arch, const debSectionEntry *Entry);
+   void PushSectionEntry(std::vector<std::string> const &Archs, const debSectionEntry *Entry);
+   void PushSectionEntry(std::string const &Arch, const debSectionEntry *Entry);
    void PushSectionEntry(const debSectionEntry *Entry);
 };
 
diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 7f596ab0d..184c07c33 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -8,18 +8,24 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/debrecords.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/fileutl.h>
+
 #include <langinfo.h>
 									/*}}}*/
 
+using std::string;
+
 // RecordParser::debRecordParser - Constructor				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
 debRecordParser::debRecordParser(string FileName,pkgCache &Cache) : 
-                  File(FileName,FileFd::ReadOnlyGzip), 
+                  File(FileName,FileFd::ReadOnly, FileFd::Extension),
                   Tags(&File, std::max(Cache.Head().MaxVerFileSize, 
 				       Cache.Head().MaxDescFileSize) + 200)
 {
@@ -77,7 +83,7 @@ string debRecordParser::SHA1Hash()
    return Section.FindS("SHA1");
 }
 									/*}}}*/
-// RecordParser::SHA1Hash - Return the archive hash			/*{{{*/
+// RecordParser::SHA256Hash - Return the archive hash			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
 string debRecordParser::SHA256Hash()
@@ -85,6 +91,14 @@ string debRecordParser::SHA256Hash()
    return Section.FindS("SHA256");
 }
 									/*}}}*/
+// RecordParser::SHA512Hash - Return the archive hash			/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string debRecordParser::SHA512Hash()
+{
+   return Section.FindS("SHA512");
+}
+									/*}}}*/
 // RecordParser::Maintainer - Return the maintainer email		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -93,6 +107,15 @@ string debRecordParser::Maintainer()
    return Section.FindS("Maintainer");
 }
 									/*}}}*/
+// RecordParser::RecordField - Return the value of an arbitrary field       /*{{*/
+// ---------------------------------------------------------------------
+/* */
+string debRecordParser::RecordField(const char *fieldName)
+{
+   return Section.FindS(fieldName);
+}
+
+                                                                        /*}}}*/
 // RecordParser::ShortDesc - Return a 1 line description		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -116,8 +139,8 @@ string debRecordParser::LongDesc()
      orig = Section.FindS("Description").c_str();
   else
   {
-     vector<string> const lang = APT::Configuration::getLanguages();
-     for (vector<string>::const_iterator l = lang.begin();
+     std::vector<string> const lang = APT::Configuration::getLanguages();
+     for (std::vector<string>::const_iterator l = lang.begin();
 	  orig.empty() && l != lang.end(); ++l)
 	orig = Section.FindS(string("Description-").append(*l).c_str());
   }
diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index 6f358abfa..b5e3bbdba 100644
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -15,11 +15,18 @@
 #define PKGLIB_DEBRECORDS_H
 
 #include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/indexfile.h>
 #include <apt-pkg/tagfile.h>
+#include <apt-pkg/fileutl.h>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/indexfile.h>
+#endif
 
 class debRecordParser : public pkgRecords::Parser
 {
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+
    FileFd File;
    pkgTagFile Tags;
    pkgTagSection Section;
@@ -32,23 +39,28 @@ class debRecordParser : public pkgRecords::Parser
    public:
 
    // These refer to the archive file for the Version
-   virtual string FileName();
-   virtual string MD5Hash();
-   virtual string SHA1Hash();
-   virtual string SHA256Hash();
-   virtual string SourcePkg();
-   virtual string SourceVer();
+   virtual std::string FileName();
+   virtual std::string MD5Hash();
+   virtual std::string SHA1Hash();
+   virtual std::string SHA256Hash();
+   virtual std::string SHA512Hash();
+   virtual std::string SourcePkg();
+   virtual std::string SourceVer();
    
    // These are some general stats about the package
-   virtual string Maintainer();
-   virtual string ShortDesc();
-   virtual string LongDesc();
-   virtual string Name();
-   virtual string Homepage();
+   virtual std::string Maintainer();
+   virtual std::string ShortDesc();
+   virtual std::string LongDesc();
+   virtual std::string Name();
+   virtual std::string Homepage();
+
+   // An arbitrary custom field
+   virtual std::string RecordField(const char *fieldName);
 
    virtual void GetRec(const char *&Start,const char *&Stop);
    
-   debRecordParser(string FileName,pkgCache &Cache);
+   debRecordParser(std::string FileName,pkgCache &Cache);
+   virtual ~debRecordParser() {};
 };
 
 #endif
diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index 749305005..ce55ccd1f 100644
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -9,6 +9,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/debsrcrecords.h>
 #include <apt-pkg/error.h>
@@ -19,6 +21,8 @@
 using std::max;
 									/*}}}*/
 
+using std::string;
+
 // SrcRecordParser::Binaries - Return the binaries field		/*{{{*/
 // ---------------------------------------------------------------------
 /* This member parses the binaries field into a pair of class arrays and
@@ -28,25 +32,32 @@ using std::max;
    used during scanning to find the right package */
 const char **debSrcRecordParser::Binaries()
 {
-   // This should use Start/Stop too, it is supposed to be efficient after all.
-   string Bins = Sect.FindS("Binary");
-   if (Bins.empty() == true || Bins.length() >= 102400)
-      return 0;
-   
-   if (Bins.length() >= BufSize)
-   {
-      delete [] Buffer;
-      // allocate new size based on buffer (but never smaller than 4000)
-      BufSize = max((unsigned int)4000, max((unsigned int)Bins.length()+1,2*BufSize));
-      Buffer = new char[BufSize];
-   }
+   const char *Start, *End;
+   if (Sect.Find("Binary", Start, End) == false)
+      return NULL;
+   for (; isspace(*Start) != 0; ++Start);
+   if (Start >= End)
+      return NULL;
+
+   StaticBinList.clear();
+   free(Buffer);
+   Buffer = strndup(Start, End - Start);
 
-   strcpy(Buffer,Bins.c_str());
-   if (TokSplitString(',',Buffer,StaticBinList,
-		      sizeof(StaticBinList)/sizeof(StaticBinList[0])) == false)
-      return 0;
+   char* bin = Buffer;
+   do {
+      char* binStartNext = strchrnul(bin, ',');
+      char* binEnd = binStartNext - 1;
+      for (; isspace(*binEnd) != 0; --binEnd)
+	 binEnd = '\0';
+      StaticBinList.push_back(bin);
+      if (*binStartNext != ',')
+	 break;
+      *binStartNext = '\0';
+      for (bin = binStartNext + 1; isspace(*bin) != 0; ++bin);
+   } while (*bin != '\0');
+   StaticBinList.push_back(NULL);
 
-   return (const char **)StaticBinList;
+   return (const char **) &StaticBinList[0];
 }
 									/*}}}*/
 // SrcRecordParser::BuildDepends - Return the Build-Depends information	/*{{{*/
@@ -55,7 +66,7 @@ const char **debSrcRecordParser::Binaries()
    package/version records representing the build dependency. The returned 
    array need not be freed and will be reused by the next call to this 
    function */
-bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps,
+bool debSrcRecordParser::BuildDepends(std::vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps,
 					bool const &ArchOnly, bool const &StripMultiArch)
 {
    unsigned int I;
@@ -100,7 +111,7 @@ bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec>
 // ---------------------------------------------------------------------
 /* This parses the list of files and returns it, each file is required to have
    a complete source package */
-bool debSrcRecordParser::Files(vector<pkgSrcRecords::File> &List)
+bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &List)
 {
    List.erase(List.begin(),List.end());
    
diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h
index 905264daa..5d2a67f4f 100644
--- a/apt-pkg/deb/debsrcrecords.h
+++ b/apt-pkg/deb/debsrcrecords.h
@@ -18,13 +18,15 @@
 
 class debSrcRecordParser : public pkgSrcRecords::Parser
 {
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+
    FileFd Fd;
    pkgTagFile Tags;
    pkgTagSection Sect;
-   char *StaticBinList[400];
+   std::vector<const char*> StaticBinList;
    unsigned long iOffset;
    char *Buffer;
-   unsigned int BufSize;
    
    public:
 
@@ -32,25 +34,25 @@ class debSrcRecordParser : public pkgSrcRecords::Parser
    virtual bool Step() {iOffset = Tags.Offset(); return Tags.Step(Sect);};
    virtual bool Jump(unsigned long const &Off) {iOffset = Off; return Tags.Jump(Sect,Off);};
 
-   virtual string Package() const {return Sect.FindS("Package");};
-   virtual string Version() const {return Sect.FindS("Version");};
-   virtual string Maintainer() const {return Sect.FindS("Maintainer");};
-   virtual string Section() const {return Sect.FindS("Section");};
+   virtual std::string Package() const {return Sect.FindS("Package");};
+   virtual std::string Version() const {return Sect.FindS("Version");};
+   virtual std::string Maintainer() const {return Sect.FindS("Maintainer");};
+   virtual std::string Section() const {return Sect.FindS("Section");};
    virtual const char **Binaries();
-   virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true);
+   virtual bool BuildDepends(std::vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true);
    virtual unsigned long Offset() {return iOffset;};
-   virtual string AsStr() 
+   virtual std::string AsStr() 
    {
       const char *Start=0,*Stop=0;
       Sect.GetSection(Start,Stop);
-      return string(Start,Stop);
+      return std::string(Start,Stop);
    };
-   virtual bool Files(vector<pkgSrcRecords::File> &F);
+   virtual bool Files(std::vector<pkgSrcRecords::File> &F);
 
-   debSrcRecordParser(string const &File,pkgIndexFile const *Index) 
-      : Parser(Index), Fd(File,FileFd::ReadOnlyGzip), Tags(&Fd,102400), 
-        Buffer(0), BufSize(0) {}
-   ~debSrcRecordParser();
+   debSrcRecordParser(std::string const &File,pkgIndexFile const *Index) 
+      : Parser(Index), Fd(File,FileFd::ReadOnly, FileFd::Extension), Tags(&Fd,102400), 
+        Buffer(NULL) {}
+   virtual ~debSrcRecordParser();
 };
 
 #endif
diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index 8619822df..7ed6936c3 100644
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -10,6 +10,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/debsystem.h>
 #include <apt-pkg/debversion.h>
 #include <apt-pkg/debindexfile.h>
@@ -17,24 +19,36 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
-#include <apti18n.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
+
+#include <apti18n.h>
 									/*}}}*/
 
+using std::string;
+
 debSystem debSys;
 
+class debSystemPrivate {
+public:
+   debSystemPrivate() : LockFD(-1), LockCount(0), StatusFile(0)
+   {
+   }
+   // For locking support
+   int LockFD;
+   unsigned LockCount;
+   
+   debStatusIndex *StatusFile;
+};
+
 // System::debSystem - Constructor					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
 debSystem::debSystem()
 {
-   LockFD = -1;
-   LockCount = 0;
-   StatusFile = 0;
-   
+   d = new debSystemPrivate();
    Label = "Debian dpkg interface";
    VS = &debVS;
 }
@@ -44,7 +58,8 @@ debSystem::debSystem()
 /* */
 debSystem::~debSystem()
 {
-   delete StatusFile;
+   delete d->StatusFile;
+   delete d;
 }
 									/*}}}*/
 // System::Lock - Get the lock						/*{{{*/
@@ -54,16 +69,16 @@ debSystem::~debSystem()
 bool debSystem::Lock()
 {
    // Disable file locking
-   if (_config->FindB("Debug::NoLocking",false) == true || LockCount > 1)
+   if (_config->FindB("Debug::NoLocking",false) == true || d->LockCount > 1)
    {
-      LockCount++;
+      d->LockCount++;
       return true;
    }
 
    // Create the lockfile
    string AdminDir = flNotFile(_config->Find("Dir::State::status"));
-   LockFD = GetLock(AdminDir + "lock");
-   if (LockFD == -1)
+   d->LockFD = GetLock(AdminDir + "lock");
+   if (d->LockFD == -1)
    {
       if (errno == EACCES || errno == EAGAIN)
 	 return _error->Error(_("Unable to lock the administration directory (%s), "
@@ -76,8 +91,8 @@ bool debSystem::Lock()
    // See if we need to abort with a dirty journal
    if (CheckUpdates() == true)
    {
-      close(LockFD);
-      LockFD = -1;
+      close(d->LockFD);
+      d->LockFD = -1;
       const char *cmd;
       if (getenv("SUDO_USER") != NULL)
 	 cmd = "sudo dpkg --configure -a";
@@ -89,7 +104,7 @@ bool debSystem::Lock()
                              "run '%s' to correct the problem. "), cmd);
    }
 
-	 LockCount++;
+	 d->LockCount++;
       
    return true;
 }
@@ -99,15 +114,15 @@ bool debSystem::Lock()
 /* */
 bool debSystem::UnLock(bool NoErrors)
 {
-   if (LockCount == 0 && NoErrors == true)
+   if (d->LockCount == 0 && NoErrors == true)
       return false;
    
-   if (LockCount < 1)
+   if (d->LockCount < 1)
       return _error->Error(_("Not locked"));
-   if (--LockCount == 0)
+   if (--d->LockCount == 0)
    {
-      close(LockFD);
-      LockCount = 0;
+      close(d->LockFD);
+      d->LockCount = 0;
    }
    
    return true;
@@ -168,9 +183,9 @@ bool debSystem::Initialize(Configuration &Cnf)
    Cnf.CndSet("Dir::State::status","/var/lib/dpkg/status");
    Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg");
 
-   if (StatusFile) {
-     delete StatusFile;
-     StatusFile = 0;
+   if (d->StatusFile) {
+     delete d->StatusFile;
+     d->StatusFile = 0;
    }
 
    return true;
@@ -206,11 +221,11 @@ signed debSystem::Score(Configuration const &Cnf)
 // System::AddStatusFiles - Register the status files			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool debSystem::AddStatusFiles(vector<pkgIndexFile *> &List)
+bool debSystem::AddStatusFiles(std::vector<pkgIndexFile *> &List)
 {
-   if (StatusFile == 0)
-      StatusFile = new debStatusIndex(_config->FindFile("Dir::State::status"));
-   List.push_back(StatusFile);
+   if (d->StatusFile == 0)
+      d->StatusFile = new debStatusIndex(_config->FindFile("Dir::State::status"));
+   List.push_back(d->StatusFile);
    return true;
 }
 									/*}}}*/
@@ -220,11 +235,11 @@ bool debSystem::AddStatusFiles(vector<pkgIndexFile *> &List)
 bool debSystem::FindIndex(pkgCache::PkgFileIterator File,
 			  pkgIndexFile *&Found) const
 {
-   if (StatusFile == 0)
+   if (d->StatusFile == 0)
       return false;
-   if (StatusFile->FindInCache(*File.Cache()) == File)
+   if (d->StatusFile->FindInCache(*File.Cache()) == File)
    {
-      Found = StatusFile;
+      Found = d->StatusFile;
       return true;
    }
    
diff --git a/apt-pkg/deb/debsystem.h b/apt-pkg/deb/debsystem.h
index 5f9995e5d..855123516 100644
--- a/apt-pkg/deb/debsystem.h
+++ b/apt-pkg/deb/debsystem.h
@@ -11,17 +11,18 @@
 #define PKGLIB_DEBSYSTEM_H
 
 #include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/pkgcache.h>
 
+class debSystemPrivate;
 class debStatusIndex;
+class pkgDepCache;
+
 class debSystem : public pkgSystem
 {
-   // For locking support
-   int LockFD;
-   unsigned LockCount;
+   // private d-pointer
+   debSystemPrivate *d;
    bool CheckUpdates();
-   
-   debStatusIndex *StatusFile;
-   
+
    public:
 
    virtual bool Lock();
@@ -35,7 +36,7 @@ class debSystem : public pkgSystem
 			  pkgIndexFile *&Found) const;
 
    debSystem();
-   ~debSystem();
+   virtual ~debSystem();
 };
 
 extern debSystem debSys;
diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc
index 340403721..a02699a44 100644
--- a/apt-pkg/deb/debversion.cc
+++ b/apt-pkg/deb/debversion.cc
@@ -10,7 +10,7 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#define APT_COMPATIBILITY 986
+#include <config.h>
 
 #include <apt-pkg/debversion.h>
 #include <apt-pkg/pkgcache.h>
@@ -257,7 +257,7 @@ bool debVersioningSystem::CheckDep(const char *PkgVer,
 // debVS::UpstreamVersion - Return the upstream version string		/*{{{*/
 // ---------------------------------------------------------------------
 /* This strips all the debian specific information from the version number */
-string debVersioningSystem::UpstreamVersion(const char *Ver)
+std::string debVersioningSystem::UpstreamVersion(const char *Ver)
 {
    // Strip off the bit before the first colon
    const char *I = Ver;
@@ -272,6 +272,6 @@ string debVersioningSystem::UpstreamVersion(const char *Ver)
       if (*I == '-')
 	 Last = I - Ver;
    
-   return string(Ver,Last);
+   return std::string(Ver,Last);
 }
 									/*}}}*/
diff --git a/apt-pkg/deb/debversion.h b/apt-pkg/deb/debversion.h
index 56fb67887..f1d6f3cc5 100644
--- a/apt-pkg/deb/debversion.h
+++ b/apt-pkg/deb/debversion.h
@@ -32,39 +32,11 @@ class debVersioningSystem : public pkgVersioningSystem
    {
       return DoCmpVersion(A,Aend,B,Bend);
    }   
-   virtual string UpstreamVersion(const char *A);
+   virtual std::string UpstreamVersion(const char *A);
 
    debVersioningSystem();
 };
 
 extern debVersioningSystem debVS;
 
-#ifdef APT_COMPATIBILITY
-#if APT_COMPATIBILITY != 986
-#warning "Using APT_COMPATIBILITY"
-#endif
-
-inline int pkgVersionCompare(const char *A, const char *B)
-{
-   return debVS.CmpVersion(A,B);
-}
-inline int pkgVersionCompare(const char *A, const char *AEnd, 
-			     const char *B, const char *BEnd)
-{
-   return debVS.DoCmpVersion(A,AEnd,B,BEnd);
-}
-inline int pkgVersionCompare(string A,string B)
-{
-   return debVS.CmpVersion(A,B);
-}
-inline bool pkgCheckDep(const char *DepVer,const char *PkgVer,int Op)
-{
-   return debVS.CheckDep(PkgVer,Op,DepVer);
-}
-inline string pkgBaseVersion(const char *Ver)
-{
-   return debVS.UpstreamVersion(Ver);
-}
-#endif
-
 #endif
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index b6c92fc23..496daf1df 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -8,6 +8,8 @@
    ##################################################################### */
 									/*}}}*/
 // Includes								/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/dpkgpm.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
@@ -16,6 +18,7 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/cachefile.h>
+#include <apt-pkg/packagemanager.h>
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -40,12 +43,28 @@
 #include <sys/ioctl.h>
 #include <pty.h>
 
-#include <config.h>
 #include <apti18n.h>
 									/*}}}*/
 
 using namespace std;
 
+class pkgDPkgPMPrivate 
+{
+public:
+   pkgDPkgPMPrivate() : stdin_is_dev_null(false), dpkgbuf_pos(0),
+			term_out(NULL), history_out(NULL)
+   {
+      dpkgbuf[0] = '\0';
+   }
+   bool stdin_is_dev_null;
+   // the buffer we use for the dpkg status-fd reading
+   char dpkgbuf[1024];
+   int dpkgbuf_pos;
+   FILE *term_out;
+   FILE *history_out;
+   string dpkg_error;
+};
+
 namespace
 {
   // Maps the dpkg "processing" info to human readable names.  Entry 0
@@ -91,7 +110,7 @@ ionice(int PID)
 {
    if (!FileExists("/usr/bin/ionice"))
       return false;
-   pid_t Process = ExecFork();      
+   pid_t Process = ExecFork();
    if (Process == 0)
    {
       char buf[32];
@@ -106,13 +125,52 @@ ionice(int PID)
    return ExecWait(Process, "ionice");
 }
 
+// dpkgChrootDirectory - chrooting for dpkg if needed			/*{{{*/
+static void dpkgChrootDirectory()
+{
+   std::string const chrootDir = _config->FindDir("DPkg::Chroot-Directory");
+   if (chrootDir == "/")
+      return;
+   std::cerr << "Chrooting into " << chrootDir << std::endl;
+   if (chroot(chrootDir.c_str()) != 0)
+      _exit(100);
+}
+									/*}}}*/
+
+
+// FindNowVersion - Helper to find a Version in "now" state	/*{{{*/
+// ---------------------------------------------------------------------
+/* This is helpful when a package is no longer installed but has residual 
+ * config files
+ */
+static 
+pkgCache::VerIterator FindNowVersion(const pkgCache::PkgIterator &Pkg)
+{
+   pkgCache::VerIterator Ver;
+   for (Ver = Pkg.VersionList(); Ver.end() == false; Ver++)
+   {
+      pkgCache::VerFileIterator Vf = Ver.FileList();
+      pkgCache::PkgFileIterator F = Vf.File();
+      for (F = Vf.File(); F.end() == false; F++)
+      {
+         if (F && F.Archive())
+         {
+            if (strcmp(F.Archive(), "now")) 
+               return Ver;
+         }
+      }
+   }
+   return Ver;
+}
+									/*}}}*/
+
 // DPkgPM::pkgDPkgPM - Constructor					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
 pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) 
-   : pkgPackageManager(Cache), dpkgbuf_pos(0),
-     term_out(NULL), history_out(NULL), PackagesDone(0), PackagesTotal(0)
+   : pkgPackageManager(Cache), PackagesDone(0), PackagesTotal(0)
 {
+   d = new pkgDPkgPMPrivate();
 }
 									/*}}}*/
 // DPkgPM::pkgDPkgPM - Destructor					/*{{{*/
@@ -120,6 +178,7 @@ pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache)
 /* */
 pkgDPkgPM::~pkgDPkgPM()
 {
+   delete d;
 }
 									/*}}}*/
 // DPkgPM::Install - Install a package					/*{{{*/
@@ -310,15 +369,7 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf)
 	 SetCloseExec(STDIN_FILENO,false);      
 	 SetCloseExec(STDERR_FILENO,false);
 
-	 if (_config->FindDir("DPkg::Chroot-Directory","/") != "/") 
-	 {
-	    std::cerr << "Chrooting into " 
-		      << _config->FindDir("DPkg::Chroot-Directory") 
-		      << std::endl;
-	    if (chroot(_config->FindDir("DPkg::Chroot-Directory","/").c_str()) != 0)
-	       _exit(100);
-	 }
-
+	 dpkgChrootDirectory();
 	 const char *Args[4];
 	 Args[0] = "/bin/sh";
 	 Args[1] = "-c";
@@ -374,9 +425,9 @@ void pkgDPkgPM::DoStdin(int master)
    unsigned char input_buf[256] = {0,}; 
    ssize_t len = read(0, input_buf, sizeof(input_buf));
    if (len)
-      write(master, input_buf, len);
+      FileFd::Write(master, input_buf, len);
    else
-      stdin_is_dev_null = true;
+      d->stdin_is_dev_null = true;
 }
 									/*}}}*/
 // DPkgPM::DoTerminalPty - Read the terminal pty and write log		/*{{{*/
@@ -400,9 +451,9 @@ void pkgDPkgPM::DoTerminalPty(int master)
    }  
    if(len <= 0) 
       return;
-   write(1, term_buf, len);
-   if(term_out)
-      fwrite(term_buf, len, sizeof(char), term_out);
+   FileFd::Write(1, term_buf, len);
+   if(d->term_out)
+      fwrite(term_buf, len, sizeof(char), d->term_out);
 }
 									/*}}}*/
 // DPkgPM::ProcessDpkgStatusBuf                                        	/*{{{*/
@@ -475,7 +526,7 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line)
 	     << ":" << s
 	     << endl;
       if(OutStatusFd > 0)
-	 write(OutStatusFd, status.str().c_str(), status.str().size());
+	 FileFd::Write(OutStatusFd, status.str().c_str(), status.str().size());
       if (Debug == true)
 	 std::clog << "send: '" << status.str() << "'" << endl;
 
@@ -499,7 +550,7 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line)
 	     << ":" << list[3]
 	     << endl;
       if(OutStatusFd > 0)
-	 write(OutStatusFd, status.str().c_str(), status.str().size());
+	 FileFd::Write(OutStatusFd, status.str().c_str(), status.str().size());
       if (Debug == true)
 	 std::clog << "send: '" << status.str() << "'" << endl;
       pkgFailures++;
@@ -513,7 +564,7 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line)
 	     << ":" << list[3]
 	     << endl;
       if(OutStatusFd > 0)
-	 write(OutStatusFd, status.str().c_str(), status.str().size());
+	 FileFd::Write(OutStatusFd, status.str().c_str(), status.str().size());
       if (Debug == true)
 	 std::clog << "send: '" << status.str() << "'" << endl;
       return;
@@ -541,7 +592,7 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line)
 	     << ":" << s
 	     << endl;
       if(OutStatusFd > 0)
-	 write(OutStatusFd, status.str().c_str(), status.str().size());
+	 FileFd::Write(OutStatusFd, status.str().c_str(), status.str().size());
       if (Debug == true)
 	 std::clog << "send: '" << status.str() << "'" << endl;
    }
@@ -606,14 +657,14 @@ void pkgDPkgPM::DoDpkgStatusFd(int statusfd, int OutStatusFd)
    char *p, *q;
    int len;
 
-   len=read(statusfd, &dpkgbuf[dpkgbuf_pos], sizeof(dpkgbuf)-dpkgbuf_pos);
-   dpkgbuf_pos += len;
+   len=read(statusfd, &d->dpkgbuf[d->dpkgbuf_pos], sizeof(d->dpkgbuf)-d->dpkgbuf_pos);
+   d->dpkgbuf_pos += len;
    if(len <= 0)
       return;
 
    // process line by line if we have a buffer
-   p = q = dpkgbuf;
-   while((q=(char*)memchr(p, '\n', dpkgbuf+dpkgbuf_pos-p)) != NULL)
+   p = q = d->dpkgbuf;
+   while((q=(char*)memchr(p, '\n', d->dpkgbuf+d->dpkgbuf_pos-p)) != NULL)
    {
       *q = 0;
       ProcessDpkgStatusLine(OutStatusFd, p);
@@ -621,8 +672,8 @@ void pkgDPkgPM::DoDpkgStatusFd(int statusfd, int OutStatusFd)
    }
 
    // now move the unprocessed bits (after the final \n that is now a 0x0) 
-   // to the start and update dpkgbuf_pos
-   p = (char*)memrchr(dpkgbuf, 0, dpkgbuf_pos);
+   // to the start and update d->dpkgbuf_pos
+   p = (char*)memrchr(d->dpkgbuf, 0, d->dpkgbuf_pos);
    if(p == NULL)
       return;
 
@@ -630,8 +681,8 @@ void pkgDPkgPM::DoDpkgStatusFd(int statusfd, int OutStatusFd)
    p++;
 
    // move the unprocessed tail to the start and update pos
-   memmove(dpkgbuf, p, p-dpkgbuf);
-   dpkgbuf_pos = dpkgbuf+dpkgbuf_pos-p;
+   memmove(d->dpkgbuf, p, p-d->dpkgbuf);
+   d->dpkgbuf_pos = d->dpkgbuf+d->dpkgbuf_pos-p;
 }
 									/*}}}*/
 // DPkgPM::WriteHistoryTag						/*{{{*/
@@ -643,7 +694,7 @@ void pkgDPkgPM::WriteHistoryTag(string const &tag, string value)
    // poor mans rstrip(", ")
    if (value[length-2] == ',' && value[length-1] == ' ')
       value.erase(length - 2, 2);
-   fprintf(history_out, "%s: %s\n", tag.c_str(), value.c_str());
+   fprintf(d->history_out, "%s: %s\n", tag.c_str(), value.c_str());
 }									/*}}}*/
 // DPkgPM::OpenLog							/*{{{*/
 bool pkgDPkgPM::OpenLog()
@@ -664,11 +715,11 @@ bool pkgDPkgPM::OpenLog()
 				   _config->Find("Dir::Log::Terminal"));
    if (!logfile_name.empty())
    {
-      term_out = fopen(logfile_name.c_str(),"a");
-      if (term_out == NULL)
+      d->term_out = fopen(logfile_name.c_str(),"a");
+      if (d->term_out == NULL)
 	 return _error->WarningE("OpenLog", _("Could not open file '%s'"), logfile_name.c_str());
-      setvbuf(term_out, NULL, _IONBF, 0);
-      SetCloseExec(fileno(term_out), true);
+      setvbuf(d->term_out, NULL, _IONBF, 0);
+      SetCloseExec(fileno(d->term_out), true);
       struct passwd *pw;
       struct group *gr;
       pw = getpwnam("root");
@@ -676,7 +727,7 @@ bool pkgDPkgPM::OpenLog()
       if (pw != NULL && gr != NULL)
 	  chown(logfile_name.c_str(), pw->pw_uid, gr->gr_gid);
       chmod(logfile_name.c_str(), 0644);
-      fprintf(term_out, "\nLog started: %s\n", timestr);
+      fprintf(d->term_out, "\nLog started: %s\n", timestr);
    }
 
    // write your history
@@ -684,11 +735,11 @@ bool pkgDPkgPM::OpenLog()
 				   _config->Find("Dir::Log::History"));
    if (!history_name.empty())
    {
-      history_out = fopen(history_name.c_str(),"a");
-      if (history_out == NULL)
+      d->history_out = fopen(history_name.c_str(),"a");
+      if (d->history_out == NULL)
 	 return _error->WarningE("OpenLog", _("Could not open file '%s'"), history_name.c_str());
       chmod(history_name.c_str(), 0644);
-      fprintf(history_out, "\nStart-Date: %s\n", timestr);
+      fprintf(d->history_out, "\nStart-Date: %s\n", timestr);
       string remove, purge, install, reinstall, upgrade, downgrade;
       for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I)
       {
@@ -729,7 +780,7 @@ bool pkgDPkgPM::OpenLog()
       WriteHistoryTag("Downgrade",downgrade);
       WriteHistoryTag("Remove",remove);
       WriteHistoryTag("Purge",purge);
-      fflush(history_out);
+      fflush(d->history_out);
    }
    
    return true;
@@ -743,16 +794,16 @@ bool pkgDPkgPM::CloseLog()
    struct tm *tmp = localtime(&t);
    strftime(timestr, sizeof(timestr), "%F  %T", tmp);
 
-   if(term_out)
+   if(d->term_out)
    {
-      fprintf(term_out, "Log ended: ");
-      fprintf(term_out, "%s", timestr);
-      fprintf(term_out, "\n");
-      fclose(term_out);
+      fprintf(d->term_out, "Log ended: ");
+      fprintf(d->term_out, "%s", timestr);
+      fprintf(d->term_out, "\n");
+      fclose(d->term_out);
    }
-   term_out = NULL;
+   d->term_out = NULL;
 
-   if(history_out)
+   if(d->history_out)
    {
       if (disappearedPkgs.empty() == false)
       {
@@ -769,12 +820,12 @@ bool pkgDPkgPM::CloseLog()
 	 }
 	 WriteHistoryTag("Disappeared", disappear);
       }
-      if (dpkg_error.empty() == false)
-	 fprintf(history_out, "Error: %s\n", dpkg_error.c_str());
-      fprintf(history_out, "End-Date: %s\n", timestr);
-      fclose(history_out);
+      if (d->dpkg_error.empty() == false)
+	 fprintf(d->history_out, "Error: %s\n", d->dpkg_error.c_str());
+      fprintf(d->history_out, "End-Date: %s\n", timestr);
+      fclose(d->history_out);
    }
-   history_out = NULL;
+   d->history_out = NULL;
 
    return true;
 }
@@ -811,6 +862,58 @@ static int racy_pselect(int nfds, fd_set *readfds, fd_set *writefds,
 */
 bool pkgDPkgPM::Go(int OutStatusFd)
 {
+   pkgPackageManager::SigINTStop = false;
+
+   // Generate the base argument list for dpkg
+   std::vector<const char *> Args;
+   unsigned long StartSize = 0;
+   string Tmp = _config->Find("Dir::Bin::dpkg","dpkg");
+   {
+      string const dpkgChrootDir = _config->FindDir("DPkg::Chroot-Directory", "/");
+      size_t dpkgChrootLen = dpkgChrootDir.length();
+      if (dpkgChrootDir != "/" && Tmp.find(dpkgChrootDir) == 0)
+      {
+	 if (dpkgChrootDir[dpkgChrootLen - 1] == '/')
+	    --dpkgChrootLen;
+	 Tmp = Tmp.substr(dpkgChrootLen);
+      }
+   }
+   Args.push_back(Tmp.c_str());
+   StartSize += Tmp.length();
+
+   // Stick in any custom dpkg options
+   Configuration::Item const *Opts = _config->Tree("DPkg::Options");
+   if (Opts != 0)
+   {
+      Opts = Opts->Child;
+      for (; Opts != 0; Opts = Opts->Next)
+      {
+	 if (Opts->Value.empty() == true)
+	    continue;
+	 Args.push_back(Opts->Value.c_str());
+	 StartSize += Opts->Value.length();
+      }
+   }
+
+   size_t const BaseArgs = Args.size();
+   // we need to detect if we can qualify packages with the architecture or not
+   Args.push_back("--assert-multi-arch");
+   Args.push_back(NULL);
+
+   pid_t dpkgAssertMultiArch = ExecFork();
+   if (dpkgAssertMultiArch == 0)
+   {
+      dpkgChrootDirectory();
+      // redirect everything to the ultimate sink as we only need the exit-status
+      int const nullfd = open("/dev/null", O_RDONLY);
+      dup2(nullfd, STDIN_FILENO);
+      dup2(nullfd, STDOUT_FILENO);
+      dup2(nullfd, STDERR_FILENO);
+      execvp(Args[0], (char**) &Args[0]);
+      _error->WarningE("dpkgGo", "Can't detect if dpkg supports multi-arch!");
+      _exit(2);
+   }
+
    fd_set rfds;
    struct timespec tv;
    sigset_t sigmask;
@@ -882,32 +985,25 @@ bool pkgDPkgPM::Go(int OutStatusFd)
       }
    }
 
-   stdin_is_dev_null = false;
+   d->stdin_is_dev_null = false;
 
    // create log
    OpenLog();
 
-   // Generate the base argument list for dpkg
-   std::vector<const char *> Args;
-   unsigned long StartSize = 0;
-   string const Tmp = _config->Find("Dir::Bin::dpkg","dpkg");
-   Args.push_back(Tmp.c_str());
-   StartSize += Tmp.length();
-
-   // Stick in any custom dpkg options
-   Configuration::Item const *Opts = _config->Tree("DPkg::Options");
-   if (Opts != 0)
+   bool dpkgMultiArch = false;
+   if (dpkgAssertMultiArch > 0)
    {
-      Opts = Opts->Child;
-      for (; Opts != 0; Opts = Opts->Next)
+      int Status = 0;
+      while (waitpid(dpkgAssertMultiArch, &Status, 0) != dpkgAssertMultiArch)
       {
-	 if (Opts->Value.empty() == true)
+	 if (errno == EINTR)
 	    continue;
-	 Args.push_back(Opts->Value.c_str());
-	 StartSize += Opts->Value.length();
+	 _error->WarningE("dpkgGo", _("Waited for %s but it wasn't there"), "dpkg --assert-multi-arch");
+	 break;
       }
+      if (WIFEXITED(Status) == true && WEXITSTATUS(Status) == 0)
+	 dpkgMultiArch = true;
    }
-   size_t const BaseArgs = Args.size();
 
    // this loop is runs once per operation
    for (vector<Item>::const_iterator I = List.begin(); I != List.end();)
@@ -943,20 +1039,24 @@ bool pkgDPkgPM::Go(int OutStatusFd)
       // the argument list is split in a way that A depends on B
       // and they are in the same "--configure A B" run
       // - with the split they may now be configured in different
-      //   runs 
+      //   runs, using Immediate-Configure-All can help prevent this.
       if (J - I > (signed)MaxArgs)
       {
 	 J = I + MaxArgs;
-	 Args.reserve(MaxArgs + 10);
+	 unsigned long const size = MaxArgs + 10;
+	 Args.reserve(size);
+	 Packages.reserve(size);
       }
       else
       {
-	 Args.reserve((J - I) + 10);
+	 unsigned long const size = (J - I) + 10;
+	 Args.reserve(size);
+	 Packages.reserve(size);
       }
 
-      
       int fd[2];
-      pipe(fd);
+      if (pipe(fd) != 0)
+	 return _error->Errno("pipe","Failed to create IPC pipe to dpkg");
 
 #define ADDARG(X) Args.push_back(X); Size += strlen(X)
 #define ADDARGC(X) Args.push_back(X); Size += sizeof(X) - 1
@@ -965,6 +1065,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
       char status_fd_buf[20];
       snprintf(status_fd_buf,sizeof(status_fd_buf),"%i", fd[1]);
       ADDARG(status_fd_buf);
+      unsigned long const Op = I->Op;
 
       switch (I->Op)
       {
@@ -1028,14 +1129,29 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 	       continue;
 	    if (I->Op == Item::Configure && disappearedPkgs.find(I->Pkg.Name()) != disappearedPkgs.end())
 	       continue;
-	    if (I->Pkg.Arch() == nativeArch || !strcmp(I->Pkg.Arch(), "all"))
+	    // We keep this here to allow "smooth" transitions from e.g. multiarch dpkg/ubuntu to dpkg/debian
+	    if (dpkgMultiArch == false && (I->Pkg.Arch() == nativeArch || !strcmp(I->Pkg.Arch(), "all")))
 	    {
 	       char const * const name = I->Pkg.Name();
 	       ADDARG(name);
 	    }
 	    else
 	    {
-	       char * const fullname = strdup(I->Pkg.FullName(false).c_str());
+	       pkgCache::VerIterator PkgVer;
+	       std::string name = I->Pkg.Name();
+	       if (Op == Item::Remove || Op == Item::Purge) 
+               {
+		  PkgVer = I->Pkg.CurrentVer();
+                  if(PkgVer.end() == true)
+                     PkgVer = FindNowVersion(I->Pkg);
+               }
+	       else
+		  PkgVer = Cache[I->Pkg].InstVerIter(Cache);
+               if (PkgVer.end() == false)
+                  name.append(":").append(PkgVer.Arch());
+               else
+                  _error->Warning("Can not find PkgVer for '%s'", name.c_str());
+	       char * const fullname = strdup(name.c_str());
 	       Packages.push_back(fullname);
 	       ADDARG(fullname);
 	    }
@@ -1067,8 +1183,13 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 	 it to all processes in the group. Since dpkg ignores the signal 
 	 it doesn't die but we do! So we must also ignore it */
       sighandler_t old_SIGQUIT = signal(SIGQUIT,SIG_IGN);
-      sighandler_t old_SIGINT = signal(SIGINT,SIG_IGN);
-
+      sighandler_t old_SIGINT = signal(SIGINT,SigINT);
+      
+      // Check here for any SIGINT
+      if (pkgPackageManager::SigINTStop && (Op == Item::Remove || Op == Item::Purge || Op == Item::Install)) 
+         break;
+      
+      
       // ignore SIGHUP as well (debian #463030)
       sighandler_t old_SIGHUP = signal(SIGHUP,SIG_IGN);
 
@@ -1087,8 +1208,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 	    const char *s = _("Can not write log, openpty() "
 	                      "failed (/dev/pts not mounted?)\n");
 	    fprintf(stderr, "%s",s);
-            if(term_out)
-              fprintf(term_out, "%s",s);
+            if(d->term_out)
+              fprintf(d->term_out, "%s",s);
 	    master = slave = -1;
 	 }  else {
 	    struct termios rtt;
@@ -1106,7 +1227,6 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 	    sigprocmask(SIG_SETMASK, &original_sigmask, 0);
 	 }
       }
-
        // Fork dpkg
       pid_t Child;
       _config->Set("APT::Keep-Fds::",fd[1]);
@@ -1117,7 +1237,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 		<< (PackagesDone/float(PackagesTotal)*100.0) 
 		<< ":" << _("Running dpkg")
 		<< endl;
-	 write(OutStatusFd, status.str().c_str(), status.str().size());
+	 FileFd::Write(OutStatusFd, status.str().c_str(), status.str().size());
       }
       Child = ExecFork();
             
@@ -1136,14 +1256,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 	 }
 	 close(fd[0]); // close the read end of the pipe
 
-	 if (_config->FindDir("DPkg::Chroot-Directory","/") != "/") 
-	 {
-	    std::cerr << "Chrooting into " 
-		      << _config->FindDir("DPkg::Chroot-Directory") 
-		      << std::endl;
-	    if (chroot(_config->FindDir("DPkg::Chroot-Directory","/").c_str()) != 0)
-	       _exit(100);
-	 }
+	 dpkgChrootDirectory();
 
 	 if (chdir(_config->FindDir("DPkg::Run-Directory","/").c_str()) != 0)
 	    _exit(100);
@@ -1213,13 +1326,14 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 	    // Restore sig int/quit
 	    signal(SIGQUIT,old_SIGQUIT);
 	    signal(SIGINT,old_SIGINT);
+
 	    signal(SIGHUP,old_SIGHUP);
 	    return _error->Errno("waitpid","Couldn't wait for subprocess");
 	 }
 
 	 // wait for input or output here
 	 FD_ZERO(&rfds);
-	 if (master >= 0 && !stdin_is_dev_null)
+	 if (master >= 0 && !d->stdin_is_dev_null)
 	    FD_SET(0, &rfds); 
 	 FD_SET(_dpkgin, &rfds);
 	 if(master >= 0)
@@ -1253,6 +1367,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
       // Restore sig int/quit
       signal(SIGQUIT,old_SIGQUIT);
       signal(SIGINT,old_SIGINT);
+      
       signal(SIGHUP,old_SIGHUP);
 
       if(master >= 0) 
@@ -1273,14 +1388,14 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 	    RunScripts("DPkg::Post-Invoke");
 
 	 if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) 
-	    strprintf(dpkg_error, "Sub-process %s received a segmentation fault.",Args[0]);
+	    strprintf(d->dpkg_error, "Sub-process %s received a segmentation fault.",Args[0]);
 	 else if (WIFEXITED(Status) != 0)
-	    strprintf(dpkg_error, "Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status));
+	    strprintf(d->dpkg_error, "Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status));
 	 else 
-	    strprintf(dpkg_error, "Sub-process %s exited unexpectedly",Args[0]);
+	    strprintf(d->dpkg_error, "Sub-process %s exited unexpectedly",Args[0]);
 
-	 if(dpkg_error.size() > 0)
-	    _error->Error("%s", dpkg_error.c_str());
+	 if(d->dpkg_error.size() > 0)
+	    _error->Error("%s", d->dpkg_error.c_str());
 
 	 if(stopOnError) 
 	 {
@@ -1290,6 +1405,9 @@ bool pkgDPkgPM::Go(int OutStatusFd)
       }      
    }
    CloseLog();
+   
+   if (pkgPackageManager::SigINTStop)
+       _error->Warning(_("Operation was interrupted before it could finish"));
 
    if (RunScripts("DPkg::Post-Invoke") == false)
       return false;
@@ -1314,6 +1432,10 @@ bool pkgDPkgPM::Go(int OutStatusFd)
    Cache.writeStateFile(NULL);
    return true;
 }
+
+void SigINT(int sig) {
+   pkgPackageManager::SigINTStop = true;
+}
 									/*}}}*/
 // pkgDpkgPM::Reset - Dump the contents of the command list		/*{{{*/
 // ---------------------------------------------------------------------
@@ -1328,6 +1450,12 @@ void pkgDPkgPM::Reset()
 /* */
 void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) 
 {
+   // If apport doesn't exist or isn't installed do nothing
+   // This e.g. prevents messages in 'universes' without apport
+   pkgCache::PkgIterator apportPkg = Cache.FindPkg("apport");
+   if (apportPkg.end() == true || apportPkg->CurrentVer == 0)
+      return;
+
    string pkgname, reportfile, srcpkgname, pkgver, arch;
    string::size_type pos;
    FILE *report;
@@ -1415,7 +1543,7 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
 	 if(strstr(strbuf,"Package:") == strbuf)
 	 {
 	    char pkgname[255], version[255];
-	    if(sscanf(strbuf, "Package: %s %s", pkgname, version) == 2)
+	    if(sscanf(strbuf, "Package: %254s %254s", pkgname, version) == 2)
 	       if(strcmp(pkgver.c_str(), version) == 0)
 	       {
 		  fclose(report);
@@ -1444,8 +1572,8 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
    fprintf(report, "ErrorMessage:\n %s\n", errormsg);
 
    // ensure that the log is flushed
-   if(term_out)
-      fflush(term_out);
+   if(d->term_out)
+      fflush(d->term_out);
 
    // attach terminal log it if we have it
    string logfile_name = _config->FindFile("Dir::Log::Terminal");
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index b7b5a6def..aab39f633 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -15,22 +15,17 @@
 #include <map>
 #include <stdio.h>
 
+#ifndef APT_8_CLEANER_HEADERS
 using std::vector;
 using std::map;
+#endif
 
+class pkgDPkgPMPrivate;
 
 class pkgDPkgPM : public pkgPackageManager
 {
    private:
-
-   bool stdin_is_dev_null;
-
-   // the buffer we use for the dpkg status-fd reading
-   char dpkgbuf[1024];
-   int dpkgbuf_pos;
-   FILE *term_out;
-   FILE *history_out;
-   string dpkg_error;
+   pkgDPkgPMPrivate *d;
 
    /** \brief record the disappear action and handle accordingly
 
@@ -45,7 +40,7 @@ class pkgDPkgPM : public pkgPackageManager
       needs to declare a Replaces on the disappeared package.
       \param pkgname Name of the package that disappeared
    */
-   void handleDisappearAction(string const &pkgname);
+   void handleDisappearAction(std::string const &pkgname);
 
    protected:
    int pkgFailures;
@@ -60,11 +55,11 @@ class pkgDPkgPM : public pkgPackageManager
    // the dpkg states that the pkg will run through, the string is 
    // the package, the vector contains the dpkg states that the package
    // will go through
-   map<string,vector<struct DpkgState> > PackageOps;
+   std::map<std::string,std::vector<struct DpkgState> > PackageOps;
    // the dpkg states that are already done; the string is the package
    // the int is the state that is already done (e.g. a package that is
    // going to be install is already in state "half-installed")
-   map<string,unsigned int> PackageOpsDone;
+   std::map<std::string,unsigned int> PackageOpsDone;
 
    // progress reporting
    unsigned int PackagesDone;
@@ -73,19 +68,19 @@ class pkgDPkgPM : public pkgPackageManager
    struct Item
    {
       enum Ops {Install, Configure, Remove, Purge, ConfigurePending, TriggersPending} Op;
-      string File;
+      std::string File;
       PkgIterator Pkg;
-      Item(Ops Op,PkgIterator Pkg,string File = "") : Op(Op),
+      Item(Ops Op,PkgIterator Pkg,std::string File = "") : Op(Op),
             File(File), Pkg(Pkg) {};
       Item() {};
       
    };
-   vector<Item> List;
+   std::vector<Item> List;
 
    // Helpers
    bool RunScriptsWithPkgs(const char *Cnf);
    bool SendV2Pkgs(FILE *F);
-   void WriteHistoryTag(string const &tag, string value);
+   void WriteHistoryTag(std::string const &tag, std::string value);
 
    // apport integration
    void WriteApportReport(const char *pkgpath, const char *errormsg);
@@ -101,7 +96,7 @@ class pkgDPkgPM : public pkgPackageManager
    void ProcessDpkgStatusLine(int OutStatusFd, char *line);
 
    // The Actuall installation implementation
-   virtual bool Install(PkgIterator Pkg,string File);
+   virtual bool Install(PkgIterator Pkg,std::string File);
    virtual bool Configure(PkgIterator Pkg);
    virtual bool Remove(PkgIterator Pkg,bool Purge = false);
    virtual bool Go(int StatusFd=-1);
@@ -113,4 +108,6 @@ class pkgDPkgPM : public pkgPackageManager
    virtual ~pkgDPkgPM();
 };
 
+void SigINT(int sig);
+
 #endif
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 580056687..1eea55560 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -8,28 +8,35 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/version.h>
 #include <apt-pkg/versionmatch.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/algorithms.h>
-
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/tagfile.h>
+#include <apt-pkg/progress.h>
+#include <apt-pkg/cacheset.h>
 
+#include <algorithm>
 #include <iostream>
-#include <sstream>    
+#include <sstream>
 #include <set>
 
 #include <sys/stat.h>
 
-#include <apti18n.h>    
+#include <apti18n.h>
 									/*}}}*/
+
+using std::string;
+
 // helper for Install-Recommends-Sections and Never-MarkAuto-Sections	/*{{{*/
 static bool 
 ConfigValueInSubTree(const char* SubTree, const char *needle)
@@ -169,14 +176,14 @@ bool pkgDepCache::readStateFile(OpProgress *Prog)			/*{{{*/
    string const state = _config->FindFile("Dir::State::extended_states");
    if(RealFileExists(state)) {
       state_file.Open(state, FileFd::ReadOnly);
-      int const file_size = state_file.Size();
+      off_t const file_size = state_file.Size();
       if(Prog != NULL)
 	 Prog->OverallProgress(0, file_size, 1, 
 			       _("Reading state information"));
 
       pkgTagFile tagfile(&state_file);
       pkgTagSection section;
-      int amt = 0;
+      off_t amt = 0;
       bool const debug_autoremove = _config->FindB("Debug::pkgAutoRemove",false);
       while(tagfile.Step(section)) {
 	 string const pkgname = section.FindS("Package");
@@ -364,14 +371,11 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res)
    
    // Check the providing packages
    PrvIterator P = Dep.TargetPkg().ProvidesList();
-   PkgIterator Pkg = Dep.ParentPkg();
    for (; P.end() != true; ++P)
    {
-      /* Provides may never be applied against the same package (or group)
-         if it is a conflicts. See the comment above. */
-      if (P.OwnerPkg()->Group == Pkg->Group && Dep.IsNegative() == true)
+      if (Dep.IsIgnorable(P) == true)
 	 continue;
-      
+
       // Check if the provides is a hit
       if (Type == NowVersion)
       {
@@ -406,60 +410,8 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res)
 									/*}}}*/
 // DepCache::AddSizes - Add the packages sizes to the counters		/*{{{*/
 // ---------------------------------------------------------------------
-/* Call with Mult = -1 to preform the inverse opration
-   The Mult increases the complexity of the calulations here and is unused -
-   or do we really have a usecase for removing the size of a package two
-   times? So let us replace it with a simple bool and be done with it… */
-__deprecated void pkgDepCache::AddSizes(const PkgIterator &Pkg,signed long Mult)
-{
-   StateCache &P = PkgState[Pkg->ID];
-   
-   if (Pkg->VersionList == 0)
-      return;
-   
-   if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure && 
-       P.Keep() == true)
-      return;
-   
-   // Compute the size data
-   if (P.NewInstall() == true)
-   {
-      iUsrSize += (signed long long)(Mult*P.InstVerIter(*this)->InstalledSize);
-      iDownloadSize += (signed long long)(Mult*P.InstVerIter(*this)->Size);
-      return;
-   }
-   
-   // Upgrading
-   if (Pkg->CurrentVer != 0 && 
-       (P.InstallVer != (Version *)Pkg.CurrentVer() || 
-	(P.iFlags & ReInstall) == ReInstall) && P.InstallVer != 0)
-   {
-      iUsrSize += (signed long long)(Mult*((signed long long)P.InstVerIter(*this)->InstalledSize - 
-			(signed long long)Pkg.CurrentVer()->InstalledSize));
-      iDownloadSize += (signed long long)(Mult*P.InstVerIter(*this)->Size);
-      return;
-   }
-   
-   // Reinstall
-   if (Pkg.State() == pkgCache::PkgIterator::NeedsUnpack &&
-       P.Delete() == false)
-   {
-      iDownloadSize += (signed long long)(Mult*P.InstVerIter(*this)->Size);
-      return;
-   }
-   
-   // Removing
-   if (Pkg->CurrentVer != 0 && P.InstallVer == 0)
-   {
-      iUsrSize -= (signed long long)(Mult*Pkg.CurrentVer()->InstalledSize);
-      return;
-   }   
-}
-									/*}}}*/
-// DepCache::AddSizes - Add the packages sizes to the counters		/*{{{*/
-// ---------------------------------------------------------------------
 /* Call with Inverse = true to preform the inverse opration */
-void pkgDepCache::AddSizes(const PkgIterator &Pkg, bool const &Inverse)
+void pkgDepCache::AddSizes(const PkgIterator &Pkg, bool const Inverse)
 {
    StateCache &P = PkgState[Pkg->ID];
    
@@ -530,8 +482,9 @@ void pkgDepCache::AddSizes(const PkgIterator &Pkg, bool const &Inverse)
    calld Remove/Add itself. Remember, dependencies can be circular so
    while processing a dep for Pkg it is possible that Add/Remove
    will be called on Pkg */
-void pkgDepCache::AddStates(const PkgIterator &Pkg,int Add)
+void pkgDepCache::AddStates(const PkgIterator &Pkg, bool const Invert)
 {
+   signed char const Add = (Invert == false) ? 1 : -1;
    StateCache &State = PkgState[Pkg->ID];
    
    // The Package is broken (either minimal dep or policy dep)
@@ -806,17 +759,17 @@ void pkgDepCache::Update(PkgIterator const &Pkg)
 // DepCache::MarkKeep - Put the package in the keep state		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser,
+bool pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser,
                            unsigned long Depth)
 {
    if (IsModeChangeOk(ModeKeep, Pkg, Depth, FromUser) == false)
-      return;
+      return false;
 
    /* Reject an attempt to keep a non-source broken installed package, those
       must be upgraded */
    if (Pkg.State() == PkgIterator::NeedsUnpack && 
        Pkg.CurrentVer().Downloadable() == false)
-      return;
+      return false;
 
    /* We changed the soft state all the time so the UI is a bit nicer
       to use */
@@ -824,7 +777,7 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser,
 
    // Check that it is not already kept
    if (P.Mode == ModeKeep)
-      return;
+      return true;
 
    if (Soft == true)
       P.iFlags |= AutoKept;
@@ -857,31 +810,31 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser,
       P.InstallVer = Pkg.CurrentVer();
 
    AddStates(Pkg);
-
    Update(Pkg);
-
    AddSizes(Pkg);
+
+   return true;
 }
 									/*}}}*/
 // DepCache::MarkDelete - Put the package in the delete state		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge,
+bool pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge,
                              unsigned long Depth, bool FromUser)
 {
    if (IsModeChangeOk(ModeDelete, Pkg, Depth, FromUser) == false)
-      return;
+      return false;
 
    StateCache &P = PkgState[Pkg->ID];
 
    // Check that it is not already marked for delete
    if ((P.Mode == ModeDelete || P.InstallVer == 0) && 
        (Pkg.Purge() == true || rPurge == false))
-      return;
+      return true;
 
    // check if we are allowed to remove the package
    if (IsDeleteOk(Pkg,rPurge,Depth,FromUser) == false)
-      return;
+      return false;
 
    P.iFlags &= ~(AutoKept | Purge);
    if (rPurge == true)
@@ -905,6 +858,7 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge,
    Update(Pkg);
    AddSizes(Pkg);
 
+   return true;
 }
 									/*}}}*/
 // DepCache::IsDeleteOk - check if it is ok to remove this package	/*{{{*/
@@ -985,18 +939,70 @@ bool pkgDepCache::IsModeChangeOk(ModeList const mode, PkgIterator const &Pkg,
 // DepCache::MarkInstall - Put the package in the install state		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
+struct CompareProviders {
+   pkgCache::PkgIterator const Pkg;
+   CompareProviders(pkgCache::DepIterator const &Dep) : Pkg(Dep.TargetPkg()) {};
+   //bool operator() (APT::VersionList::iterator const &AV, APT::VersionList::iterator const &BV)
+   bool operator() (pkgCache::VerIterator const &AV, pkgCache::VerIterator const &BV)
+   {
+      pkgCache::PkgIterator const A = AV.ParentPkg();
+      pkgCache::PkgIterator const B = BV.ParentPkg();
+      // Prefer packages in the same group as the target; e.g. foo:i386, foo:amd64
+      if (A->Group != B->Group)
+      {
+	 if (A->Group == Pkg->Group && B->Group != Pkg->Group)
+	    return false;
+	 else if (B->Group == Pkg->Group && A->Group != Pkg->Group)
+	    return true;
+      }
+      // we like essentials
+      if ((A->Flags & pkgCache::Flag::Essential) != (B->Flags & pkgCache::Flag::Essential))
+      {
+	 if ((A->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
+	    return false;
+	 else if ((B->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
+	    return true;
+      }
+      if ((A->Flags & pkgCache::Flag::Important) != (B->Flags & pkgCache::Flag::Important))
+      {
+	 if ((A->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important)
+	    return false;
+	 else if ((B->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important)
+	    return true;
+      }
+      // higher priority seems like a good idea
+      if (AV->Priority != BV->Priority)
+	 return AV->Priority < BV->Priority;
+      // prefer native architecture
+      if (strcmp(A.Arch(), B.Arch()) != 0)
+      {
+	 if (strcmp(A.Arch(), A.Cache()->NativeArch()) == 0)
+	    return false;
+	 else if (strcmp(B.Arch(), B.Cache()->NativeArch()) == 0)
+	    return true;
+	 std::vector<std::string> archs = APT::Configuration::getArchitectures();
+	 for (std::vector<std::string>::const_iterator a = archs.begin(); a != archs.end(); ++a)
+	    if (*a == A.Arch())
+	       return false;
+	    else if (*a == B.Arch())
+	       return true;
+      }
+      // unable to decide…
+      return A->ID < B->ID;
+   }
+};
+bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
 			      unsigned long Depth, bool FromUser,
 			      bool ForceImportantDeps)
 {
    if (IsModeChangeOk(ModeInstall, Pkg, Depth, FromUser) == false)
-      return;
+      return false;
 
    StateCache &P = PkgState[Pkg->ID];
 
    // See if there is even any possible instalation candidate
    if (P.CandidateVer == 0)
-      return;
+      return false;
 
    /* Check that it is not already marked for install and that it can be 
       installed */
@@ -1005,13 +1011,13 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
 	P.CandidateVer == (Version *)Pkg.CurrentVer()))
    {
       if (P.CandidateVer == (Version *)Pkg.CurrentVer() && P.InstallVer == 0)
-	 MarkKeep(Pkg, false, FromUser, Depth+1);
-      return;
+	 return MarkKeep(Pkg, false, FromUser, Depth+1);
+      return true;
    }
 
    // check if we are allowed to install the package
    if (IsInstallOk(Pkg,AutoInst,Depth,FromUser) == false)
-      return;
+      return false;
 
    ActionGroup group(*this);
    P.iFlags &= ~AutoKept;
@@ -1046,8 +1052,8 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
    Update(Pkg);
    AddSizes(Pkg);
 
-   if (AutoInst == false)
-      return;
+   if (AutoInst == false || _config->Find("APT::Solver", "internal") != "internal")
+      return true;
 
    if (DebugMarker == true)
       std::clog << OutputInDepth(Depth) << "MarkInstall " << Pkg << " FU=" << FromUser << std::endl;
@@ -1091,7 +1097,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
 	    continue;
 	 // if the dependency was critical, we can't install it, so remove it again
 	 MarkDelete(Pkg,false,Depth + 1, false);
-	 return;
+	 return false;
       }
 
       /* Check if any ImportantDep() (but not Critical) were added
@@ -1147,41 +1153,28 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
 
       /* This bit is for processing the possibilty of an install/upgrade
          fixing the problem */
-      SPtrArray<Version *> List = Start.AllTargets();
       if (Start->Type != Dep::DpkgBreaks &&
 	  (DepState[Start->ID] & DepCVer) == DepCVer)
       {
-	 // Right, find the best version to install..
-	 Version **Cur = List;
-	 PkgIterator P = Start.TargetPkg();
-	 PkgIterator InstPkg(*Cache,0);
-	 
-	 // See if there are direct matches (at the start of the list)
-	 for (; *Cur != 0 && (*Cur)->ParentPkg == P.Index(); Cur++)
+	 APT::VersionList verlist;
+	 pkgCache::VerIterator Cand = PkgState[Start.TargetPkg()->ID].CandidateVerIter(*this);
+	 if (Cand.end() == false && VS().CheckDep(Cand.VerStr(), Start->CompareOp, Start.TargetVer()) == true)
+	    verlist.insert(Cand);
+	 for (PrvIterator Prv = Start.TargetPkg().ProvidesList(); Prv.end() != true; ++Prv)
 	 {
-	    PkgIterator Pkg(*Cache,Cache->PkgP + (*Cur)->ParentPkg);
-	    if (PkgState[Pkg->ID].CandidateVer != *Cur)
+	    pkgCache::VerIterator V = Prv.OwnerVer();
+	    pkgCache::VerIterator Cand = PkgState[Prv.OwnerPkg()->ID].CandidateVerIter(*this);
+	    if (Cand.end() == true || V != Cand ||
+		VS().CheckDep(Cand.VerStr(), Start->CompareOp, Start.TargetVer()) == false)
 	       continue;
-	    InstPkg = Pkg;
-	    break;
+	    verlist.insert(Cand);
 	 }
+	 CompareProviders comp(Start);
+	 APT::VersionList::iterator InstVer = std::max_element(verlist.begin(), verlist.end(), comp);
 
-	 // Select the highest priority providing package
-	 if (InstPkg.end() == true)
-	 {
-	    pkgPrioSortList(*Cache,Cur);
-	    for (; *Cur != 0; Cur++)
-	    {
-	       PkgIterator Pkg(*Cache,Cache->PkgP + (*Cur)->ParentPkg);
-	       if (PkgState[Pkg->ID].CandidateVer != *Cur)
-		  continue;
-	       InstPkg = Pkg;
-	       break;
-	    }
-	 }
-	 
-	 if (InstPkg.end() == false)
+	 if (InstVer != verlist.end())
 	 {
+	    pkgCache::PkgIterator InstPkg = InstVer.ParentPkg();
 	    if(DebugAutoInstall == true)
 	       std::clog << OutputInDepth(Depth) << "Installing " << InstPkg.Name()
 			 << " as " << Start.DepType() << " of " << Pkg.Name()
@@ -1199,7 +1192,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
  	       // mark automatic dependency
  	       MarkInstall(InstPkg,true,Depth + 1, false, ForceImportantDeps);
  	       // Set the autoflag, after MarkInstall because MarkInstall unsets it
- 	       if (P->CurrentVer == 0)
+ 	       if (InstPkg->CurrentVer == 0)
  		  PkgState[InstPkg->ID].Flags |= Flag::Auto;
  	    }
 	 }
@@ -1211,6 +1204,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
          upgrade the package. */
       if (Start.IsNegative() == true)
       {
+	 SPtrArray<Version *> List = Start.AllTargets();
 	 for (Version **I = List; *I != 0; I++)
 	 {
 	    VerIterator Ver(*this,*I);
@@ -1222,14 +1216,17 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
 	       continue;
 
 	    if (PkgState[Pkg->ID].CandidateVer != *I &&
-	        Start->Type == Dep::DpkgBreaks)
-	       MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps);
-	    else
-	       MarkDelete(Pkg,false,Depth + 1, false);
+		Start->Type == Dep::DpkgBreaks &&
+		MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps) == true)
+	       continue;
+	    else if (MarkDelete(Pkg,false,Depth + 1, false) == false)
+	       break;
 	 }
 	 continue;
       }      
    }
+
+   return Dep.end() == true;
 }
 									/*}}}*/
 // DepCache::IsInstallOk - check if it is ok to install this package	/*{{{*/
@@ -1250,25 +1247,42 @@ void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To)
    if (unlikely(Pkg.end() == true))
       return;
 
+   APT::PackageList pkglist;
+   if (Pkg->CurrentVer != 0 &&
+       (Pkg.CurrentVer()-> MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same)
+   {
+      pkgCache::GrpIterator Grp = Pkg.Group();
+      for (pkgCache::PkgIterator P = Grp.PackageList(); P.end() == false; P = Grp.NextPkg(P))
+      {
+	 if (P->CurrentVer != 0)
+	    pkglist.insert(P);
+      }
+   }
+   else
+      pkglist.insert(Pkg);
+
    ActionGroup group(*this);
 
-   RemoveSizes(Pkg);
-   RemoveStates(Pkg);
-   
-   StateCache &P = PkgState[Pkg->ID];
-   if (To == true)
-      P.iFlags |= ReInstall;
-   else
-      P.iFlags &= ~ReInstall;
-   
-   AddStates(Pkg);
-   AddSizes(Pkg);
+   for (APT::PackageList::const_iterator Pkg = pkglist.begin(); Pkg != pkglist.end(); ++Pkg)
+   {
+      RemoveSizes(Pkg);
+      RemoveStates(Pkg);
+
+      StateCache &P = PkgState[Pkg->ID];
+      if (To == true)
+	 P.iFlags |= ReInstall;
+      else
+	 P.iFlags &= ~ReInstall;
+
+      AddStates(Pkg);
+      AddSizes(Pkg);
+   }
 }
 									/*}}}*/
 // DepCache::SetCandidateVersion - Change the candidate version		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void pkgDepCache::SetCandidateVersion(VerIterator TargetVer, bool const &Pseudo)
+void pkgDepCache::SetCandidateVersion(VerIterator TargetVer)
 {
    pkgCache::PkgIterator Pkg = TargetVer.ParentPkg();
    StateCache &P = PkgState[Pkg->ID];
@@ -1558,7 +1572,7 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator const &Dep)
       return true;
    else if(Dep->Type == pkgCache::Dep::Recommends) 
    {
-      if ( _config->FindB("APT::Install-Recommends", false))
+      if (InstallRecommends)
 	 return true;
       // we suport a special mode to only install-recommends for certain
       // sections
@@ -1569,11 +1583,17 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator const &Dep)
 	 return true;
    }
    else if(Dep->Type == pkgCache::Dep::Suggests)
-     return _config->FindB("APT::Install-Suggests", false);
+      return InstallSuggests;
 
    return false;
 }
 									/*}}}*/
+// Policy::GetPriority - Get the priority of the package pin		/*{{{*/
+signed short pkgDepCache::Policy::GetPriority(pkgCache::PkgIterator const &Pkg)
+{ return 0; };
+signed short pkgDepCache::Policy::GetPriority(pkgCache::PkgFileIterator const &File)
+{ return 0; };
+									/*}}}*/
 pkgDepCache::InRootSetFunc *pkgDepCache::GetRootSetFunc()		/*{{{*/
 {
   DefaultRootSetFunc *f = new DefaultRootSetFunc;
@@ -1599,6 +1619,9 @@ bool pkgDepCache::MarkFollowsSuggests()
 // pkgDepCache::MarkRequired - the main mark algorithm			/*{{{*/
 bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc)
 {
+   if (_config->Find("APT::Solver", "internal") != "internal")
+      return true;
+
    bool follow_recommends;
    bool follow_suggests;
    bool debug_autoremove = _config->FindB("Debug::pkgAutoRemove",false);
@@ -1625,6 +1648,7 @@ bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc)
    {
       if(!(PkgState[p->ID].Flags & Flag::Auto) ||
 	  (p->Flags & Flag::Essential) ||
+	  (p->Flags & Flag::Important) ||
 	  userFunc.InRootSet(p) ||
 	  // be nice even then a required package violates the policy (#583517)
 	  // and do the full mark process also for required packages
diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index 760f0b589..7358048ed 100644
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -40,12 +40,18 @@
 
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/error.h>
 
 #include <vector>
 #include <memory>
 #include <set>
+#include <list>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/progress.h>
+#include <apt-pkg/error.h>
+#endif
+
+class OpProgress;
 
 class pkgDepCache : protected pkgCache::Namespace
 {
@@ -233,6 +239,7 @@ class pkgDepCache : protected pkgCache::Namespace
       inline bool Delete() const {return Mode == ModeDelete;};
       inline bool Purge() const {return Delete() == true && (iFlags & pkgDepCache::Purge) == pkgDepCache::Purge; };
       inline bool Keep() const {return Mode == ModeKeep;};
+      inline bool Protect() const {return (iFlags & Protected) == Protected;};
       inline bool Upgrade() const {return Status > 0 && Mode == ModeInstall;};
       inline bool Upgradable() const {return Status >= 1;};
       inline bool Downgrade() const {return Status < 0 && Mode == ModeInstall;};
@@ -257,11 +264,21 @@ class pkgDepCache : protected pkgCache::Namespace
    class Policy
    {
       public:
-      
+      Policy() {
+         InstallRecommends = _config->FindB("APT::Install-Recommends", false);
+         InstallSuggests = _config->FindB("APT::Install-Suggests", false);
+      }
+
       virtual VerIterator GetCandidateVer(PkgIterator const &Pkg);
       virtual bool IsImportantDep(DepIterator const &Dep);
-      
+      virtual signed short GetPriority(PkgIterator const &Pkg);
+      virtual signed short GetPriority(PkgFileIterator const &File);
+
       virtual ~Policy() {};
+
+      private:
+      bool InstallRecommends;
+      bool InstallSuggests;
    };
 
    private:
@@ -315,11 +332,10 @@ class pkgDepCache : protected pkgCache::Namespace
    void Update(PkgIterator const &P);
    
    // Count manipulators
-   void AddSizes(const PkgIterator &Pkg, bool const &Invert = false);
+   void AddSizes(const PkgIterator &Pkg, bool const Invert = false);
    inline void RemoveSizes(const PkgIterator &Pkg) {AddSizes(Pkg, true);};
-   void AddSizes(const PkgIterator &Pkg,signed long Mult) __deprecated;
-   void AddStates(const PkgIterator &Pkg,int Add = 1);
-   inline void RemoveStates(const PkgIterator &Pkg) {AddStates(Pkg,-1);};
+   void AddStates(const PkgIterator &Pkg, bool const Invert = false);
+   inline void RemoveStates(const PkgIterator &Pkg) {AddStates(Pkg,true);};
    
    public:
 
@@ -328,9 +344,9 @@ class pkgDepCache : protected pkgCache::Namespace
    inline Header &Head() {return *Cache->HeaderP;};
    inline GrpIterator GrpBegin() {return Cache->GrpBegin();};
    inline PkgIterator PkgBegin() {return Cache->PkgBegin();};
-   inline GrpIterator FindGrp(string const &Name) {return Cache->FindGrp(Name);};
-   inline PkgIterator FindPkg(string const &Name) {return Cache->FindPkg(Name);};
-   inline PkgIterator FindPkg(string const &Name, string const &Arch) {return Cache->FindPkg(Name, Arch);};
+   inline GrpIterator FindGrp(std::string const &Name) {return Cache->FindGrp(Name);};
+   inline PkgIterator FindPkg(std::string const &Name) {return Cache->FindPkg(Name);};
+   inline PkgIterator FindPkg(std::string const &Name, std::string const &Arch) {return Cache->FindPkg(Name, Arch);};
 
    inline pkgCache &GetCache() {return *Cache;};
    inline pkgVersioningSystem &VS() {return *Cache->VS;};
@@ -388,18 +404,17 @@ class pkgDepCache : protected pkgCache::Namespace
    /** \name State Manipulators
     */
    // @{
-   void MarkKeep(PkgIterator const &Pkg, bool Soft = false,
+   bool MarkKeep(PkgIterator const &Pkg, bool Soft = false,
 		 bool FromUser = true, unsigned long Depth = 0);
-   void MarkDelete(PkgIterator const &Pkg, bool MarkPurge = false,
+   bool MarkDelete(PkgIterator const &Pkg, bool MarkPurge = false,
                    unsigned long Depth = 0, bool FromUser = true);
-   void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true,
+   bool MarkInstall(PkgIterator const &Pkg,bool AutoInst = true,
 		    unsigned long Depth = 0, bool FromUser = true,
 		    bool ForceImportantDeps = false);
    void MarkProtected(PkgIterator const &Pkg) { PkgState[Pkg->ID].iFlags |= Protected; };
 
    void SetReInstall(PkgIterator const &Pkg,bool To);
-   // FIXME: Remove the unused boolean parameter on abi break
-   void SetCandidateVersion(VerIterator TargetVer, bool const &Pseudo = true);
+   void SetCandidateVersion(VerIterator TargetVer);
    bool SetCandidateRelease(pkgCache::VerIterator TargetVer,
 				std::string const &TargetRel);
    /** Set the candidate version for dependencies too if needed.
@@ -484,13 +499,6 @@ class pkgDepCache : protected pkgCache::Namespace
    virtual ~pkgDepCache();
 
    private:
-   // Helper for Update(OpProgress) to remove pseudoinstalled arch all packages
-   // FIXME: they are private so shouldn't affect abi, but just in case…
-   __deprecated bool RemovePseudoInstalledPkg(PkgIterator &Pkg, std::set<unsigned long> &recheck) { return true; };
-   __deprecated bool ReInstallPseudoForGroup(unsigned long const &Grp, std::set<unsigned long> &recheck) { return true; };
-   __deprecated bool ReInstallPseudoForGroup(pkgCache::PkgIterator const &P, std::set<unsigned long> &recheck) { return true; };
-
-
    bool IsModeChangeOk(ModeList const mode, PkgIterator const &Pkg,
 			unsigned long const Depth, bool const FromUser);
 };
diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
new file mode 100644
index 000000000..791aac72f
--- /dev/null
+++ b/apt-pkg/edsp.cc
@@ -0,0 +1,573 @@
+// -*- mode: cpp; mode: fold -*-
+// Description								/*{{{*/
+/* ######################################################################
+   Set of methods to help writing and reading everything needed for EDSP
+   ##################################################################### */
+									/*}}}*/
+// Include Files							/*{{{*/
+#include <config.h>
+
+#include <apt-pkg/edsp.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/cacheset.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/version.h>
+#include <apt-pkg/policy.h>
+#include <apt-pkg/tagfile.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/progress.h>
+
+#include <limits>
+#include <stdio.h>
+
+#include <string>
+
+#include <apti18n.h>
+									/*}}}*/
+
+using std::string;
+
+// we could use pkgCache::DepType and ::Priority, but these would be localized strings…
+const char * const EDSP::PrioMap[] = {0, "important", "required", "standard",
+				      "optional", "extra"};
+const char * const EDSP::DepMap[] = {"", "Depends", "Pre-Depends", "Suggests",
+				     "Recommends" , "Conflicts", "Replaces",
+				     "Obsoletes", "Breaks", "Enhances"};
+
+// EDSP::WriteScenario - to the given file descriptor			/*{{{*/
+bool EDSP::WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress)
+{
+   if (Progress != NULL)
+      Progress->SubProgress(Cache.Head().VersionCount, _("Send scenario to solver"));
+   unsigned long p = 0;
+   for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; ++Pkg)
+      for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver, ++p)
+      {
+	 WriteScenarioVersion(Cache, output, Pkg, Ver);
+	 WriteScenarioDependency(Cache, output, Pkg, Ver);
+	 fprintf(output, "\n");
+	 if (Progress != NULL && p % 100 == 0)
+	    Progress->Progress(p);
+      }
+   return true;
+}
+									/*}}}*/
+// EDSP::WriteLimitedScenario - to the given file descriptor		/*{{{*/
+bool EDSP::WriteLimitedScenario(pkgDepCache &Cache, FILE* output,
+				APT::PackageSet const &pkgset,
+				OpProgress *Progress)
+{
+   if (Progress != NULL)
+      Progress->SubProgress(Cache.Head().VersionCount, _("Send scenario to solver"));
+   unsigned long p  = 0;
+   for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg, ++p)
+      for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver)
+      {
+	 WriteScenarioVersion(Cache, output, Pkg, Ver);
+	 WriteScenarioLimitedDependency(Cache, output, Pkg, Ver, pkgset);
+	 fprintf(output, "\n");
+	 if (Progress != NULL && p % 100 == 0)
+	    Progress->Progress(p);
+      }
+   if (Progress != NULL)
+      Progress->Done();
+   return true;
+}
+									/*}}}*/
+// EDSP::WriteScenarioVersion						/*{{{*/
+void EDSP::WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgIterator const &Pkg,
+				pkgCache::VerIterator const &Ver)
+{
+   fprintf(output, "Package: %s\n", Pkg.Name());
+   fprintf(output, "Architecture: %s\n", Ver.Arch());
+   fprintf(output, "Version: %s\n", Ver.VerStr());
+   if (Pkg.CurrentVer() == Ver)
+      fprintf(output, "Installed: yes\n");
+   if (Pkg->SelectedState == pkgCache::State::Hold ||
+       (Cache[Pkg].Keep() == true && Cache[Pkg].Protect() == true))
+      fprintf(output, "Hold: yes\n");
+   fprintf(output, "APT-ID: %d\n", Ver->ID);
+   fprintf(output, "Priority: %s\n", PrioMap[Ver->Priority]);
+   if ((Pkg->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
+      fprintf(output, "Essential: yes\n");
+   fprintf(output, "Section: %s\n", Ver.Section());
+   if ((Ver->MultiArch & pkgCache::Version::Allowed) == pkgCache::Version::Allowed)
+      fprintf(output, "Multi-Arch: allowed\n");
+   else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign)
+      fprintf(output, "Multi-Arch: foreign\n");
+   else if ((Ver->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same)
+      fprintf(output, "Multi-Arch: same\n");
+   signed short Pin = std::numeric_limits<signed short>::min();
+   for (pkgCache::VerFileIterator File = Ver.FileList(); File.end() == false; ++File) {
+      signed short const p = Cache.GetPolicy().GetPriority(File.File());
+      if (Pin < p)
+	 Pin = p;
+   }
+   fprintf(output, "APT-Pin: %d\n", Pin);
+   if (Cache.GetCandidateVer(Pkg) == Ver)
+      fprintf(output, "APT-Candidate: yes\n");
+   if ((Cache[Pkg].Flags & pkgCache::Flag::Auto) == pkgCache::Flag::Auto)
+      fprintf(output, "APT-Automatic: yes\n");
+}
+									/*}}}*/
+// EDSP::WriteScenarioDependency					/*{{{*/
+void EDSP::WriteScenarioDependency(pkgDepCache &Cache, FILE* output, pkgCache::PkgIterator const &Pkg,
+				pkgCache::VerIterator const &Ver)
+{
+   std::string dependencies[pkgCache::Dep::Enhances + 1];
+   bool orGroup = false;
+   for (pkgCache::DepIterator Dep = Ver.DependsList(); Dep.end() == false; ++Dep)
+   {
+      // Ignore implicit dependencies for multiarch here
+      if (strcmp(Pkg.Arch(), Dep.TargetPkg().Arch()) != 0)
+	 continue;
+      if (orGroup == false)
+	 dependencies[Dep->Type].append(", ");
+      dependencies[Dep->Type].append(Dep.TargetPkg().Name());
+      if (Dep->Version != 0)
+	 dependencies[Dep->Type].append(" (").append(pkgCache::CompTypeDeb(Dep->CompareOp)).append(" ").append(Dep.TargetVer()).append(")");
+      if ((Dep->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or)
+      {
+	 dependencies[Dep->Type].append(" | ");
+	 orGroup = true;
+      }
+      else
+	 orGroup = false;
+   }
+   for (int i = 1; i < pkgCache::Dep::Enhances + 1; ++i)
+      if (dependencies[i].empty() == false)
+	 fprintf(output, "%s: %s\n", DepMap[i], dependencies[i].c_str()+2);
+   string provides;
+   for (pkgCache::PrvIterator Prv = Ver.ProvidesList(); Prv.end() == false; ++Prv)
+   {
+      // Ignore implicit provides for multiarch here
+      if (strcmp(Pkg.Arch(), Prv.ParentPkg().Arch()) != 0 || strcmp(Pkg.Name(),Prv.Name()) == 0)
+	 continue;
+      provides.append(", ").append(Prv.Name());
+   }
+   if (provides.empty() == false)
+      fprintf(output, "Provides: %s\n", provides.c_str()+2);
+}
+									/*}}}*/
+// EDSP::WriteScenarioLimitedDependency					/*{{{*/
+void EDSP::WriteScenarioLimitedDependency(pkgDepCache &Cache, FILE* output,
+					  pkgCache::PkgIterator const &Pkg,
+					  pkgCache::VerIterator const &Ver,
+					  APT::PackageSet const &pkgset)
+{
+   std::string dependencies[pkgCache::Dep::Enhances + 1];
+   bool orGroup = false;
+   for (pkgCache::DepIterator Dep = Ver.DependsList(); Dep.end() == false; ++Dep)
+   {
+      // Ignore implicit dependencies for multiarch here
+      if (strcmp(Pkg.Arch(), Dep.TargetPkg().Arch()) != 0)
+	 continue;
+      if (orGroup == false)
+      {
+	 if (pkgset.find(Dep.TargetPkg()) == pkgset.end())
+	    continue;
+	 dependencies[Dep->Type].append(", ");
+      }
+      else if (pkgset.find(Dep.TargetPkg()) == pkgset.end())
+      {
+	 if ((Dep->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or)
+	    continue;
+	 dependencies[Dep->Type].erase(dependencies[Dep->Type].end()-3, dependencies[Dep->Type].end());
+	 orGroup = false;
+	 continue;
+      }
+      dependencies[Dep->Type].append(Dep.TargetPkg().Name());
+      if (Dep->Version != 0)
+	 dependencies[Dep->Type].append(" (").append(pkgCache::CompTypeDeb(Dep->CompareOp)).append(" ").append(Dep.TargetVer()).append(")");
+      if ((Dep->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or)
+      {
+	 dependencies[Dep->Type].append(" | ");
+	 orGroup = true;
+      }
+      else
+	 orGroup = false;
+   }
+   for (int i = 1; i < pkgCache::Dep::Enhances + 1; ++i)
+      if (dependencies[i].empty() == false)
+	 fprintf(output, "%s: %s\n", DepMap[i], dependencies[i].c_str()+2);
+   string provides;
+   for (pkgCache::PrvIterator Prv = Ver.ProvidesList(); Prv.end() == false; ++Prv)
+   {
+      // Ignore implicit provides for multiarch here
+      if (strcmp(Pkg.Arch(), Prv.ParentPkg().Arch()) != 0 || strcmp(Pkg.Name(),Prv.Name()) == 0)
+	 continue;
+      if (pkgset.find(Prv.ParentPkg()) == pkgset.end())
+	 continue;
+      provides.append(", ").append(Prv.Name());
+   }
+   if (provides.empty() == false)
+      fprintf(output, "Provides: %s\n", provides.c_str()+2);
+}
+									/*}}}*/
+// EDSP::WriteRequest - to the given file descriptor			/*{{{*/
+bool EDSP::WriteRequest(pkgDepCache &Cache, FILE* output, bool const Upgrade,
+			bool const DistUpgrade, bool const AutoRemove,
+			OpProgress *Progress)
+{
+   if (Progress != NULL)
+      Progress->SubProgress(Cache.Head().PackageCount, _("Send request to solver"));
+   unsigned long p = 0;
+   string del, inst;
+   for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; ++Pkg, ++p)
+   {
+      if (Progress != NULL && p % 100 == 0)
+         Progress->Progress(p);
+      string* req;
+      if (Cache[Pkg].Delete() == true)
+	 req = &del;
+      else if (Cache[Pkg].NewInstall() == true || Cache[Pkg].Upgrade() == true)
+	 req = &inst;
+      else
+	 continue;
+      req->append(" ").append(Pkg.FullName());
+   }
+   fprintf(output, "Request: EDSP 0.4\n");
+   if (del.empty() == false)
+      fprintf(output, "Remove: %s\n", del.c_str()+1);
+   if (inst.empty() == false)
+      fprintf(output, "Install: %s\n", inst.c_str()+1);
+   if (Upgrade == true)
+      fprintf(output, "Upgrade: yes\n");
+   if (DistUpgrade == true)
+      fprintf(output, "Dist-Upgrade: yes\n");
+   if (AutoRemove == true)
+      fprintf(output, "Autoremove: yes\n");
+   if (_config->FindB("APT::Solver::Strict-Pinning", true) == false)
+      fprintf(output, "Strict-Pinning: no\n");
+   string solverpref("APT::Solver::");
+   solverpref.append(_config->Find("APT::Solver", "internal")).append("::Preferences");
+   if (_config->Exists(solverpref) == true)
+      fprintf(output, "Preferences: %s\n", _config->Find(solverpref,"").c_str());
+   fprintf(output, "\n");
+
+   return true;
+}
+									/*}}}*/
+// EDSP::ReadResponse - from the given file descriptor			/*{{{*/
+bool EDSP::ReadResponse(int const input, pkgDepCache &Cache, OpProgress *Progress) {
+	/* We build an map id to mmap offset here
+	   In theory we could use the offset as ID, but then VersionCount
+	   couldn't be used to create other versionmappings anymore and it
+	   would be too easy for a (buggy) solver to segfault APT… */
+	unsigned long long const VersionCount = Cache.Head().VersionCount;
+	unsigned long VerIdx[VersionCount];
+	for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; ++P) {
+		for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; ++V)
+			VerIdx[V->ID] = V.Index();
+		Cache[P].Marked = true;
+		Cache[P].Garbage = false;
+	}
+
+	FileFd in;
+	in.OpenDescriptor(input, FileFd::ReadOnly);
+	pkgTagFile response(&in, 100);
+	pkgTagSection section;
+
+	while (response.Step(section) == true) {
+		std::string type;
+		if (section.Exists("Install") == true)
+			type = "Install";
+		else if (section.Exists("Remove") == true)
+			type = "Remove";
+		else if (section.Exists("Progress") == true) {
+			if (Progress != NULL) {
+				string msg = section.FindS("Message");
+				if (msg.empty() == true)
+					msg = _("Prepare for receiving solution");
+				Progress->SubProgress(100, msg, section.FindI("Percentage", 0));
+			}
+			continue;
+		} else if (section.Exists("Error") == true) {
+			std::string msg = SubstVar(SubstVar(section.FindS("Message"), "\n .\n", "\n\n"), "\n ", "\n");
+			if (msg.empty() == true) {
+				msg = _("External solver failed without a proper error message");
+				_error->Error("%s", msg.c_str());
+			} else
+				_error->Error("External solver failed with: %s", msg.substr(0,msg.find('\n')).c_str());
+			if (Progress != NULL)
+				Progress->Done();
+			std::cerr << "The solver encountered an error of type: " << section.FindS("Error") << std::endl;
+			std::cerr << "The following information might help you to understand what is wrong:" << std::endl;
+			std::cerr << msg << std::endl << std::endl;
+			return false;
+		} else if (section.Exists("Autoremove") == true)
+			type = "Autoremove";
+		else
+			continue;
+
+		size_t const id = section.FindULL(type.c_str(), VersionCount);
+		if (id == VersionCount) {
+			_error->Warning("Unable to parse %s request with id value '%s'!", type.c_str(), section.FindS(type.c_str()).c_str());
+			continue;
+		} else if (id > Cache.Head().VersionCount) {
+			_error->Warning("ID value '%s' in %s request stanza is to high to refer to a known version!", section.FindS(type.c_str()).c_str(), type.c_str());
+			continue;
+		}
+
+		pkgCache::VerIterator Ver(Cache.GetCache(), Cache.GetCache().VerP + VerIdx[id]);
+		Cache.SetCandidateVersion(Ver);
+		if (type == "Install")
+			Cache.MarkInstall(Ver.ParentPkg(), false, 0, false);
+		else if (type == "Remove")
+			Cache.MarkDelete(Ver.ParentPkg(), false);
+		else if (type == "Autoremove") {
+			Cache[Ver.ParentPkg()].Marked = false;
+			Cache[Ver.ParentPkg()].Garbage = true;
+		}
+	}
+	return true;
+}
+									/*}}}*/
+// EDSP::ReadLine - first line from the given file descriptor		/*{{{*/
+// ---------------------------------------------------------------------
+/* Little helper method to read a complete line into a string. Similar to
+   fgets but we need to use the low-level read() here as otherwise the
+   listparser will be confused later on as mixing of fgets and read isn't
+   a supported action according to the manpages and results are undefined */
+bool EDSP::ReadLine(int const input, std::string &line) {
+	char one;
+	ssize_t data = 0;
+	line.erase();
+	line.reserve(100);
+	while ((data = read(input, &one, sizeof(one))) != -1) {
+		if (data != 1)
+			continue;
+		if (one == '\n')
+			return true;
+		if (one == '\r')
+			continue;
+		if (line.empty() == true && isblank(one) != 0)
+			continue;
+		line += one;
+	}
+	return false;
+}
+									/*}}}*/
+// EDSP::StringToBool - convert yes/no to bool				/*{{{*/
+// ---------------------------------------------------------------------
+/* we are not as lazy as we are in the global StringToBool as we really
+   only accept yes/no here - but we will ignore leading spaces */
+bool EDSP::StringToBool(char const *answer, bool const defValue) {
+   for (; isspace(*answer) != 0; ++answer);
+   if (strncasecmp(answer, "yes", 3) == 0)
+      return true;
+   else if (strncasecmp(answer, "no", 2) == 0)
+      return false;
+   else
+      _error->Warning("Value '%s' is not a boolean 'yes' or 'no'!", answer);
+   return defValue;
+}
+									/*}}}*/
+// EDSP::ReadRequest - first stanza from the given file descriptor	/*{{{*/
+bool EDSP::ReadRequest(int const input, std::list<std::string> &install,
+			std::list<std::string> &remove, bool &upgrade,
+			bool &distUpgrade, bool &autoRemove)
+{
+   install.clear();
+   remove.clear();
+   upgrade = false;
+   distUpgrade = false;
+   autoRemove = false;
+   std::string line;
+   while (ReadLine(input, line) == true)
+   {
+      // Skip empty lines before request
+      if (line.empty() == true)
+	 continue;
+      // The first Tag must be a request, so search for it
+      if (line.compare(0, 8, "Request:") != 0)
+	 continue;
+
+      while (ReadLine(input, line) == true)
+      {
+	 // empty lines are the end of the request
+	 if (line.empty() == true)
+	    return true;
+
+	 std::list<std::string> *request = NULL;
+	 if (line.compare(0, 8, "Install:") == 0)
+	 {
+	    line.erase(0, 8);
+	    request = &install;
+	 }
+	 else if (line.compare(0, 7, "Remove:") == 0)
+	 {
+	    line.erase(0, 7);
+	    request = &remove;
+	 }
+	 else if (line.compare(0, 8, "Upgrade:") == 0)
+	    upgrade = EDSP::StringToBool(line.c_str() + 9, false);
+	 else if (line.compare(0, 13, "Dist-Upgrade:") == 0)
+	    distUpgrade = EDSP::StringToBool(line.c_str() + 14, false);
+	 else if (line.compare(0, 11, "Autoremove:") == 0)
+	    autoRemove = EDSP::StringToBool(line.c_str() + 12, false);
+	 else
+	    _error->Warning("Unknown line in EDSP Request stanza: %s", line.c_str());
+
+	 if (request == NULL)
+	    continue;
+	 size_t end = line.length();
+	 do {
+	    size_t begin = line.rfind(' ');
+	    if (begin == std::string::npos)
+	    {
+	       request->push_back(line.substr(0, end));
+	       break;
+	    }
+	    else if (begin < end)
+	       request->push_back(line.substr(begin + 1, end));
+	    line.erase(begin);
+	    end = line.find_last_not_of(' ');
+	 } while (end != std::string::npos);
+      }
+   }
+   return false;
+}
+									/*}}}*/
+// EDSP::ApplyRequest - first stanza from the given file descriptor	/*{{{*/
+bool EDSP::ApplyRequest(std::list<std::string> const &install,
+			 std::list<std::string> const &remove,
+			 pkgDepCache &Cache)
+{
+	for (std::list<std::string>::const_iterator i = install.begin();
+	     i != install.end(); ++i) {
+		pkgCache::PkgIterator P = Cache.FindPkg(*i);
+		if (P.end() == true)
+			_error->Warning("Package %s is not known, so can't be installed", i->c_str());
+		else
+			Cache.MarkInstall(P, false);
+	}
+
+	for (std::list<std::string>::const_iterator i = remove.begin();
+	     i != remove.end(); ++i) {
+		pkgCache::PkgIterator P = Cache.FindPkg(*i);
+		if (P.end() == true)
+			_error->Warning("Package %s is not known, so can't be installed", i->c_str());
+		else
+			Cache.MarkDelete(P);
+	}
+	return true;
+}
+									/*}}}*/
+// EDSP::WriteSolution - to the given file descriptor			/*{{{*/
+bool EDSP::WriteSolution(pkgDepCache &Cache, FILE* output)
+{
+   bool const Debug = _config->FindB("Debug::EDSP::WriteSolution", false);
+   for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; ++Pkg)
+   {
+      if (Cache[Pkg].Delete() == true)
+      {
+	 fprintf(output, "Remove: %d\n", Pkg.CurrentVer()->ID);
+	 if (Debug == true)
+	    fprintf(output, "Package: %s\nVersion: %s\n", Pkg.FullName().c_str(), Pkg.CurrentVer().VerStr());
+      }
+      else if (Cache[Pkg].NewInstall() == true || Cache[Pkg].Upgrade() == true)
+      {
+	 fprintf(output, "Install: %d\n", Cache.GetCandidateVer(Pkg)->ID);
+	 if (Debug == true)
+	    fprintf(output, "Package: %s\nVersion: %s\n", Pkg.FullName().c_str(), Cache.GetCandidateVer(Pkg).VerStr());
+      }
+      else if (Cache[Pkg].Garbage == true)
+      {
+	 fprintf(output, "Autoremove: %d\n", Pkg.CurrentVer()->ID);
+	 if (Debug == true)
+	    fprintf(output, "Package: %s\nVersion: %s\n", Pkg.FullName().c_str(), Pkg.CurrentVer().VerStr());
+	    fprintf(stderr, "Autoremove: %s\nVersion: %s\n", Pkg.FullName().c_str(), Pkg.CurrentVer().VerStr());
+      }
+      else
+	 continue;
+      fprintf(output, "\n");
+   }
+
+   return true;
+}
+									/*}}}*/
+// EDSP::WriteProgess - pulse to the given file descriptor		/*{{{*/
+bool EDSP::WriteProgress(unsigned short const percent, const char* const message, FILE* output) {
+	fprintf(output, "Progress: %s\n", TimeRFC1123(time(NULL)).c_str());
+	fprintf(output, "Percentage: %d\n", percent);
+	fprintf(output, "Message: %s\n\n", message);
+	fflush(output);
+	return true;
+}
+									/*}}}*/
+// EDSP::WriteError - format an error message to be send to file descriptor /*{{{*/
+bool EDSP::WriteError(char const * const uuid, std::string const &message, FILE* output) {
+	fprintf(output, "Error: %s\n", uuid);
+	fprintf(output, "Message: %s\n\n", SubstVar(SubstVar(message, "\n\n", "\n.\n"), "\n", "\n ").c_str());
+	return true;
+}
+									/*}}}*/
+// EDSP::ExecuteSolver - fork requested solver and setup ipc pipes	{{{*/
+bool EDSP::ExecuteSolver(const char* const solver, int *solver_in, int *solver_out) {
+	std::vector<std::string> const solverDirs = _config->FindVector("Dir::Bin::Solvers");
+	std::string file;
+	for (std::vector<std::string>::const_iterator dir = solverDirs.begin();
+	     dir != solverDirs.end(); ++dir) {
+		file = flCombine(*dir, solver);
+		if (RealFileExists(file.c_str()) == true)
+			break;
+		file.clear();
+	}
+
+	if (file.empty() == true)
+		return _error->Error("Can't call external solver '%s' as it is not in a configured directory!", solver);
+	int external[4] = {-1, -1, -1, -1};
+	if (pipe(external) != 0 || pipe(external + 2) != 0)
+		return _error->Errno("Resolve", "Can't create needed IPC pipes for EDSP");
+	for (int i = 0; i < 4; ++i)
+		SetCloseExec(external[i], true);
+
+	pid_t Solver = ExecFork();
+	if (Solver == 0) {
+		dup2(external[0], STDIN_FILENO);
+		dup2(external[3], STDOUT_FILENO);
+		const char* calling[2] = { file.c_str(), 0 };
+		execv(calling[0], (char**) calling);
+		std::cerr << "Failed to execute solver '" << solver << "'!" << std::endl;
+		_exit(100);
+	}
+	close(external[0]);
+	close(external[3]);
+
+	if (WaitFd(external[1], true, 5) == false)
+		return _error->Errno("Resolve", "Timed out while Waiting on availability of solver stdin");
+
+	*solver_in = external[1];
+	*solver_out = external[2];
+	return true;
+}
+									/*}}}*/
+// EDSP::ResolveExternal - resolve problems by asking external for help	{{{*/
+bool EDSP::ResolveExternal(const char* const solver, pkgDepCache &Cache,
+			 bool const upgrade, bool const distUpgrade,
+			 bool const autoRemove, OpProgress *Progress) {
+	int solver_in, solver_out;
+	if (EDSP::ExecuteSolver(solver, &solver_in, &solver_out) == false)
+		return false;
+
+	FILE* output = fdopen(solver_in, "w");
+	if (output == NULL)
+		return _error->Errno("Resolve", "fdopen on solver stdin failed");
+
+	if (Progress != NULL)
+		Progress->OverallProgress(0, 100, 5, _("Execute external solver"));
+	EDSP::WriteRequest(Cache, output, upgrade, distUpgrade, autoRemove, Progress);
+	if (Progress != NULL)
+		Progress->OverallProgress(5, 100, 20, _("Execute external solver"));
+	EDSP::WriteScenario(Cache, output, Progress);
+	fclose(output);
+
+	if (Progress != NULL)
+		Progress->OverallProgress(25, 100, 75, _("Execute external solver"));
+	if (EDSP::ReadResponse(solver_out, Cache, Progress) == false)
+		return false;
+
+	return true;
+}
+									/*}}}*/
diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h
new file mode 100644
index 000000000..12b06d143
--- /dev/null
+++ b/apt-pkg/edsp.h
@@ -0,0 +1,230 @@
+// -*- mode: cpp; mode: fold -*-
+/** Description \file edsp.h						{{{
+   ######################################################################
+   Set of methods to help writing and reading everything needed for EDSP
+   with the noteable exception of reading a scenario for conversion into
+   a Cache as this is handled by edsp interface for listparser and friends
+   ##################################################################### */
+									/*}}}*/
+#ifndef PKGLIB_EDSP_H
+#define PKGLIB_EDSP_H
+
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheset.h>
+
+#include <list>
+#include <string>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/progress.h>
+#endif
+
+class pkgDepCache;
+class OpProgress;
+
+class EDSP								/*{{{*/
+{
+	// we could use pkgCache::DepType and ::Priority, but these would be localized strings…
+	static const char * const PrioMap[];
+	static const char * const DepMap[];
+
+	bool static ReadLine(int const input, std::string &line);
+	bool static StringToBool(char const *answer, bool const defValue);
+
+	void static WriteScenarioVersion(pkgDepCache &Cache, FILE* output,
+					 pkgCache::PkgIterator const &Pkg,
+					 pkgCache::VerIterator const &Ver);
+	void static WriteScenarioDependency(pkgDepCache &Cache, FILE* output,
+					    pkgCache::PkgIterator const &Pkg,
+					    pkgCache::VerIterator const &Ver);
+	void static WriteScenarioLimitedDependency(pkgDepCache &Cache, FILE* output,
+						   pkgCache::PkgIterator const &Pkg,
+						   pkgCache::VerIterator const &Ver,
+						   APT::PackageSet const &pkgset);
+public:
+	/** \brief creates the EDSP request stanza
+	 *
+	 *  In the EDSP protocol the first thing send to the resolver is a stanza
+	 *  encoding the request. This method will write this stanza by looking at
+	 *  the given Cache and requests the installation of all packages which were
+	 *  marked for installation in it (equally for remove).
+	 *
+	 *  \param Cache in which the request is encoded
+	 *  \param output is written to this "file"
+	 *  \param upgrade is true if it is an request like apt-get upgrade
+	 *  \param distUpgrade is true if it is a request like apt-get dist-upgrade
+	 *  \param autoRemove is true if removal of unneeded packages should be performed
+	 *  \param Progress is an instance to report progress to
+	 *
+	 *  \return true if request was composed successfully, otherwise false
+	 */
+	bool static WriteRequest(pkgDepCache &Cache, FILE* output,
+				 bool const upgrade = false,
+				 bool const distUpgrade = false,
+				 bool const autoRemove = false,
+				OpProgress *Progress = NULL);
+
+	/** \brief creates the scenario representing the package universe
+	 *
+	 *  After the request all known information about a package are send
+	 *  to the solver. The output looks similar to a Packages or status file
+	 *
+	 *  All packages and version included in this Cache are send, even if
+	 *  it doesn't make sense from an APT resolver point of view like versions
+	 *  with a negative pin to enable the solver to propose even that as a
+	 *  solution or at least to be able to give a hint what can be done to
+	 *  statisfy a request.
+	 *
+	 *  \param Cache is the known package universe
+	 *  \param output is written to this "file"
+	 *  \param Progress is an instance to report progress to
+	 *
+	 *  \return true if universe was composed successfully, otherwise false
+	 */
+	bool static WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress = NULL);
+
+	/** \brief creates a limited scenario representing the package universe
+	 *
+	 *  This method works similar to #WriteScenario as it works in the same
+	 *  way but doesn't send the complete universe to the solver but only
+	 *  packages included in the pkgset which will have only dependencies
+	 *  on packages which are in the given set. All other dependencies will
+	 *  be removed, so that this method can be used to create testcases
+	 *
+	 *  \param Cache is the known package universe
+	 *  \param output is written to this "file"
+	 *  \param pkgset is a set of packages the universe should be limited to
+	 *  \param Progress is an instance to report progress to
+	 *
+	 *  \return true if universe was composed successfully, otherwise false
+	 */
+	bool static WriteLimitedScenario(pkgDepCache &Cache, FILE* output,
+					 APT::PackageSet const &pkgset,
+					 OpProgress *Progress = NULL);
+
+	/** \brief waits and acts on the information returned from the solver
+	 *
+	 *  This method takes care of interpreting whatever the solver sends
+	 *  through the standard output like a solution, progress or an error.
+	 *  The main thread should handle his control over to this method to
+	 *  wait for the solver to finish the given task
+	 *
+	 *  \param input file descriptor with the response from the solver
+	 *  \param Cache the solution should be applied on if any
+	 *  \param Progress is an instance to report progress to
+	 *
+	 *  \return true if a solution is found and applied correctly, otherwise false
+	 */
+	bool static ReadResponse(int const input, pkgDepCache &Cache, OpProgress *Progress = NULL);
+
+	/** \brief search and read the request stanza for action later
+	 *
+	 *  This method while ignore the input up to the point it finds the
+	 *  Request: line as an indicator for the Request stanza.
+	 *  The request is stored in the parameters install and remove then,
+	 *  as the cache isn't build yet as the scenario follows the request.
+	 *
+	 *  \param input file descriptor with the edsp input for the solver
+	 *  \param[out] install is a list which gets populated with requested installs
+	 *  \param[out] remove is a list which gets populated with requested removals
+	 *  \param[out] upgrade is true if it is a request like apt-get upgrade
+	 *  \param[out] distUpgrade is true if it is a request like apt-get dist-upgrade
+	 *  \param[out] autoRemove is true if removal of uneeded packages should be performed
+	 *
+	 *  \return true if the request could be found and worked on, otherwise false
+	 */
+	bool static ReadRequest(int const input, std::list<std::string> &install,
+			std::list<std::string> &remove, bool &upgrade,
+			bool &distUpgrade, bool &autoRemove);
+
+	/** \brief takes the request lists and applies it on the cache
+	 *
+	 *  The lists as created by #ReadRequest will be used to find the
+	 *  packages in question and mark them for install/remove.
+	 *  No solving is done and no auto-install/-remove.
+	 *
+	 *  \param install is a list of packages to mark for installation
+	 *  \param remove is a list of packages to mark for removal
+	 *  \param Cache is there the markers should be set
+	 *
+	 *  \return false if the request couldn't be applied, true otherwise
+	 */
+	bool static ApplyRequest(std::list<std::string> const &install,
+				 std::list<std::string> const &remove,
+				 pkgDepCache &Cache);
+
+	/** \brief encodes the changes in the Cache as a EDSP solution
+	 *
+	 *  The markers in the Cache are observed and send to given
+	 *  file. The solution isn't checked for consistency or alike,
+	 *  so even broken solutions can be written successfully,
+	 *  but the front-end revicing it will properly fail then.
+	 *
+	 *  \param Cache which represents the solution
+	 *  \param output to write the stanzas forming the solution to
+	 *
+	 *  \return true if solution could be written, otherwise false
+	 */
+	bool static WriteSolution(pkgDepCache &Cache, FILE* output);
+
+	/** \brief sends a progress report
+	 *
+	 *  \param percent of the solving completed
+	 *  \param message the solver wants the user to see
+	 *  \param output the front-end listens for progress report
+	 */
+	bool static WriteProgress(unsigned short const percent, const char* const message, FILE* output);
+
+	/** \brief sends an error report
+	 *
+	 *  Solvers are expected to execute successfully even if
+	 *  they were unable to calculate a solution for a given task.
+	 *  Obviously they can't send a solution through, so this
+	 *  methods deals with formatting an error message correctly
+	 *  so that the front-ends can recieve and display it.
+	 *
+	 *  The first line of the message should be a short description
+	 *  of the error so it can be used for dialog titles or alike
+	 *
+	 *  \param uuid of this error message
+	 *  \param message is free form text to discribe the error
+	 *  \param output the front-end listens for error messages
+	 */
+	bool static WriteError(char const * const uuid, std::string const &message, FILE* output);
+
+
+	/** \brief executes the given solver and returns the pipe ends
+	 *
+	 *  The given solver is executed if it can be found in one of the
+	 *  configured directories and setup for it is performed.
+	 *
+	 *  \param solver to execute
+	 *  \param[out] solver_in will be the stdin of the solver
+	 *  \param[out] solver_out will be the stdout of the solver
+	 *
+	 *  \return true if the solver could be started and the pipes
+	 *  are set up correctly, otherwise false and the pipes are invalid
+	 */
+	bool static ExecuteSolver(const char* const solver, int *solver_in, int *solver_out);
+
+	/** \brief call an external resolver to handle the request
+	 *
+	 *  This method wraps all the methods above to call an external solver
+	 *
+	 *  \param solver to execute
+	 *  \param Cache with the problem and as universe to work in
+	 *  \param upgrade is true if it is a request like apt-get upgrade
+	 *  \param distUpgrade is true if it is a request like apt-get dist-upgrade
+	 *  \param autoRemove is true if unneeded packages should be removed
+	 *  \param Progress is an instance to report progress to
+	 *
+	 *  \return true if the solver has successfully solved the problem,
+	 *  otherwise false
+	 */
+	bool static ResolveExternal(const char* const solver, pkgDepCache &Cache,
+				    bool const upgrade, bool const distUpgrade,
+				    bool const autoRemove, OpProgress *Progress = NULL);
+};
+									/*}}}*/
+#endif
diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc
new file mode 100644
index 000000000..482581979
--- /dev/null
+++ b/apt-pkg/edsp/edspindexfile.cc
@@ -0,0 +1,78 @@
+// -*- mode: cpp; mode: fold -*-
+// Description								/*{{{*/
+/* ######################################################################
+   The scenario file is designed to work as an intermediate file between
+   APT and the resolver. Its on propose very similar to a dpkg status file
+   ##################################################################### */
+									/*}}}*/
+// Include Files							/*{{{*/
+#include <config.h>
+
+#include <apt-pkg/edspindexfile.h>
+#include <apt-pkg/edsplistparser.h>
+#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/progress.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/acquire-item.h>
+
+#include <sys/stat.h>
+									/*}}}*/
+
+// edspIndex::edspIndex - Constructor					/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+edspIndex::edspIndex(std::string File) : debStatusIndex(File)
+{
+}
+									/*}}}*/
+// StatusIndex::Merge - Load the index file into a cache		/*{{{*/
+bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
+{
+   FileFd Pkg;
+   if (File != "stdin")
+      Pkg.Open(File, FileFd::ReadOnly);
+   else
+      Pkg.OpenDescriptor(STDIN_FILENO, FileFd::ReadOnly);
+   if (_error->PendingError() == true)
+      return false;
+   edspListParser Parser(&Pkg);
+   if (_error->PendingError() == true)
+      return false;
+
+   if (Prog != NULL)
+      Prog->SubProgress(0,File);
+   if (Gen.SelectFile(File,std::string(),*this) == false)
+      return _error->Error("Problem with SelectFile %s",File.c_str());
+
+   // Store the IMS information
+   pkgCache::PkgFileIterator CFile = Gen.GetCurFile();
+   CFile->Size = Pkg.FileSize();
+   CFile->mtime = Pkg.ModificationTime();
+   CFile->Archive = Gen.WriteUniqString("edsp::scenario");
+
+   if (Gen.MergeList(Parser) == false)
+      return _error->Error("Problem with MergeList %s",File.c_str());
+   return true;
+}
+									/*}}}*/
+// Index File types for APT						/*{{{*/
+class edspIFType: public pkgIndexFile::Type
+{
+   public:
+   virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator File) const
+   {
+      // we don't have a record parser for this type as the file is not presistent
+      return NULL;
+   };
+   edspIFType() {Label = "EDSP scenario file";};
+};
+static edspIFType _apt_Universe;
+
+const pkgIndexFile::Type *edspIndex::GetType() const
+{
+   return &_apt_Universe;
+}
+									/*}}}*/
diff --git a/apt-pkg/edsp/edspindexfile.h b/apt-pkg/edsp/edspindexfile.h
new file mode 100644
index 000000000..de10f2d2f
--- /dev/null
+++ b/apt-pkg/edsp/edspindexfile.h
@@ -0,0 +1,31 @@
+// -*- mode: cpp; mode: fold -*-
+// Description								/*{{{*/
+/* ######################################################################
+   The scenario file is designed to work as an intermediate file between
+   APT and the resolver. Its on propose very similar to a dpkg status file
+   ##################################################################### */
+									/*}}}*/
+#ifndef PKGLIB_EDSPINDEXFILE_H
+#define PKGLIB_EDSPINDEXFILE_H
+
+#include <apt-pkg/debindexfile.h>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/indexfile.h>
+#endif
+
+class edspIndex : public debStatusIndex
+{
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+
+   public:
+
+   virtual const Type *GetType() const;
+
+   virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
+
+   edspIndex(std::string File);
+};
+
+#endif
diff --git a/apt-pkg/edsp/edsplistparser.cc b/apt-pkg/edsp/edsplistparser.cc
new file mode 100644
index 000000000..bcfdb1017
--- /dev/null
+++ b/apt-pkg/edsp/edsplistparser.cc
@@ -0,0 +1,92 @@
+// -*- mode: cpp; mode: fold -*-
+// Description								/*{{{*/
+/* ######################################################################
+
+   Package Cache Generator - Generator for the cache structure.
+
+   This builds the cache structure from the abstract package list parser.
+
+   ##################################################################### */
+									/*}}}*/
+// Include Files							/*{{{*/
+#include <config.h>
+
+#include <apt-pkg/edsplistparser.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/md5.h>
+#include <apt-pkg/macros.h>
+									/*}}}*/
+
+// ListParser::edspListParser - Constructor				/*{{{*/
+edspListParser::edspListParser(FileFd *File, std::string const &Arch) : debListParser(File, Arch)
+{}
+									/*}}}*/
+// ListParser::NewVersion - Fill in the version structure		/*{{{*/
+bool edspListParser::NewVersion(pkgCache::VerIterator &Ver)
+{
+   Ver->ID = Section.FindI("APT-ID", Ver->ID);
+   return debListParser::NewVersion(Ver);
+}
+									/*}}}*/
+// ListParser::Description - Return the description string		/*{{{*/
+// ---------------------------------------------------------------------
+/* Sorry, no description for the resolvers… */
+std::string edspListParser::Description()
+{
+   return "";
+}
+std::string edspListParser::DescriptionLanguage()
+{
+   return "";
+}
+MD5SumValue edspListParser::Description_md5()
+{
+   return MD5SumValue("");
+}
+									/*}}}*/
+// ListParser::VersionHash - Compute a unique hash for this version	/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+unsigned short edspListParser::VersionHash()
+{
+   if (Section.Exists("APT-Hash") == true)
+      return Section.FindI("APT-Hash");
+   else if (Section.Exists("APT-ID") == true)
+      return Section.FindI("APT-ID");
+   return 0;
+}
+									/*}}}*/
+// ListParser::ParseStatus - Parse the status field			/*{{{*/
+// ---------------------------------------------------------------------
+/* The Status: line here is not a normal dpkg one but just one which tells
+   use if the package is installed or not, where missing means not. */
+bool edspListParser::ParseStatus(pkgCache::PkgIterator &Pkg,
+				pkgCache::VerIterator &Ver)
+{
+   unsigned long state = 0;
+   if (Section.FindFlag("Hold",state,pkgCache::State::Hold) == false)
+      return false;
+   if (state != 0)
+      Pkg->SelectedState = pkgCache::State::Hold;
+
+   state = 0;
+   if (Section.FindFlag("Installed",state,pkgCache::State::Installed) == false)
+      return false;
+   if (state != 0)
+   {
+      Pkg->CurrentState = pkgCache::State::Installed;
+      Pkg->CurrentVer = Ver.Index();
+   }
+
+   return true;
+}
+									/*}}}*/
+// ListParser::LoadReleaseInfo - Load the release information		/*{{{*/
+bool edspListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,
+				    FileFd &File, std::string component)
+{
+   return true;
+}
+									/*}}}*/
diff --git a/apt-pkg/edsp/edsplistparser.h b/apt-pkg/edsp/edsplistparser.h
new file mode 100644
index 000000000..a7bf9de95
--- /dev/null
+++ b/apt-pkg/edsp/edsplistparser.h
@@ -0,0 +1,43 @@
+// -*- mode: cpp; mode: fold -*-
+// Description								/*{{{*/
+/* ######################################################################
+
+   EDSP Package List Parser - This implements the abstract parser
+   interface for the APT specific intermediate format which is passed
+   to external resolvers
+
+   ##################################################################### */
+									/*}}}*/
+#ifndef PKGLIB_EDSPLISTPARSER_H
+#define PKGLIB_EDSPLISTPARSER_H
+
+#include <apt-pkg/deblistparser.h>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/pkgcachegen.h>
+#include <apt-pkg/indexfile.h>
+#include <apt-pkg/tagfile.h>
+#endif
+
+class FileFd;
+
+class edspListParser : public debListParser
+{
+   public:
+   virtual bool NewVersion(pkgCache::VerIterator &Ver);
+   virtual std::string Description();
+   virtual std::string DescriptionLanguage();
+   virtual MD5SumValue Description_md5();
+   virtual unsigned short VersionHash();
+
+   bool LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,FileFd &File,
+			std::string section);
+
+   edspListParser(FileFd *File, std::string const &Arch = "");
+
+   protected:
+   virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
+
+};
+
+#endif
diff --git a/apt-pkg/edsp/edspsystem.cc b/apt-pkg/edsp/edspsystem.cc
new file mode 100644
index 000000000..6b9207451
--- /dev/null
+++ b/apt-pkg/edsp/edspsystem.cc
@@ -0,0 +1,127 @@
+// -*- mode: cpp; mode: fold -*-
+// Description								/*{{{*/
+/* ######################################################################
+
+   This system provides the abstraction to use the scenario file as the
+   only source of package information to be able to feed the created file
+   back to APT for its own consumption (eat your own dogfood).
+
+   ##################################################################### */
+									/*}}}*/
+// Include Files							/*{{{*/
+#include <config.h>
+
+#include <apt-pkg/edspsystem.h>
+#include <apt-pkg/debversion.h>
+#include <apt-pkg/edspindexfile.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <errno.h>
+
+#include <apti18n.h>
+									/*}}}*/
+
+edspSystem edspSys;
+
+// System::debSystem - Constructor					/*{{{*/
+edspSystem::edspSystem()
+{
+   StatusFile = 0;
+
+   Label = "Debian APT solver interface";
+   VS = &debVS;
+}
+									/*}}}*/
+// System::~debSystem - Destructor					/*{{{*/
+edspSystem::~edspSystem()
+{
+   delete StatusFile;
+}
+									/*}}}*/
+// System::Lock - Get the lock						/*{{{*/
+bool edspSystem::Lock()
+{
+   return true;
+}
+									/*}}}*/
+// System::UnLock - Drop a lock						/*{{{*/
+bool edspSystem::UnLock(bool NoErrors)
+{
+   return true;
+}
+									/*}}}*/
+// System::CreatePM - Create the underlying package manager		/*{{{*/
+// ---------------------------------------------------------------------
+/* we can't use edsp input as input for real installations - just a
+   simulation can work, but everything else will fail bigtime */
+pkgPackageManager *edspSystem::CreatePM(pkgDepCache *Cache) const
+{
+   return NULL;
+}
+									/*}}}*/
+// System::Initialize - Setup the configuration space..			/*{{{*/
+bool edspSystem::Initialize(Configuration &Cnf)
+{
+   Cnf.Set("Dir::State::extended_states", "/dev/null");
+   Cnf.Set("Dir::State::status","/dev/null");
+   Cnf.Set("Dir::State::lists","/dev/null");
+
+   Cnf.Set("Debug::NoLocking", "true");
+   Cnf.Set("APT::Get::Simulate", "true");
+
+   if (StatusFile) {
+     delete StatusFile;
+     StatusFile = 0;
+   }
+   return true;
+}
+									/*}}}*/
+// System::ArchiveSupported - Is a file format supported		/*{{{*/
+bool edspSystem::ArchiveSupported(const char *Type)
+{
+   return false;
+}
+									/*}}}*/
+// System::Score - Determine if we should use the edsp system		/*{{{*/
+signed edspSystem::Score(Configuration const &Cnf)
+{
+   if (Cnf.Find("edsp::scenario", "") == "stdin")
+      return 1000;
+   if (FileExists(Cnf.FindFile("edsp::scenario","")) == true)
+      return 1000;
+   return -1000;
+}
+									/*}}}*/
+// System::AddStatusFiles - Register the status files			/*{{{*/
+bool edspSystem::AddStatusFiles(std::vector<pkgIndexFile *> &List)
+{
+   if (StatusFile == 0)
+   {
+      if (_config->Find("edsp::scenario", "") == "stdin")
+	 StatusFile = new edspIndex("stdin");
+      else
+	 StatusFile = new edspIndex(_config->FindFile("edsp::scenario"));
+   }
+   List.push_back(StatusFile);
+   return true;
+}
+									/*}}}*/
+// System::FindIndex - Get an index file for status files		/*{{{*/
+bool edspSystem::FindIndex(pkgCache::PkgFileIterator File,
+			  pkgIndexFile *&Found) const
+{
+   if (StatusFile == 0)
+      return false;
+   if (StatusFile->FindInCache(*File.Cache()) == File)
+   {
+      Found = StatusFile;
+      return true;
+   }
+
+   return false;
+}
+									/*}}}*/
diff --git a/apt-pkg/edsp/edspsystem.h b/apt-pkg/edsp/edspsystem.h
new file mode 100644
index 000000000..ca703fa84
--- /dev/null
+++ b/apt-pkg/edsp/edspsystem.h
@@ -0,0 +1,41 @@
+// -*- mode: cpp; mode: fold -*-
+// Description								/*{{{*/
+// $Id: debsystem.h,v 1.4 2003/01/11 07:16:33 jgg Exp $
+/* ######################################################################
+
+   System - Debian version of the  System Class
+
+   ##################################################################### */
+									/*}}}*/
+#ifndef PKGLIB_EDSPSYSTEM_H
+#define PKGLIB_EDSPSYSTEM_H
+
+#include <apt-pkg/pkgsystem.h>
+
+class edspIndex;
+class edspSystem : public pkgSystem
+{
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+
+   edspIndex *StatusFile;
+
+   public:
+
+   virtual bool Lock();
+   virtual bool UnLock(bool NoErrors = false);
+   virtual pkgPackageManager *CreatePM(pkgDepCache *Cache) const;
+   virtual bool Initialize(Configuration &Cnf);
+   virtual bool ArchiveSupported(const char *Type);
+   virtual signed Score(Configuration const &Cnf);
+   virtual bool AddStatusFiles(std::vector<pkgIndexFile *> &List);
+   virtual bool FindIndex(pkgCache::PkgFileIterator File,
+			  pkgIndexFile *&Found) const;
+
+   edspSystem();
+   ~edspSystem();
+};
+
+extern edspSystem edspSys;
+
+#endif
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index 747e464be..e29e2819c 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -10,18 +10,18 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include "indexcopy.h"
+#include<config.h>
 
 #include <apt-pkg/error.h>
 #include <apt-pkg/progress.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/indexrecords.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/cdrom.h>
-#include <apti18n.h>
 
 #include <iostream>
 #include <sstream>
@@ -30,12 +30,14 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <stdlib.h>
+
+#include "indexcopy.h"
+#include <apti18n.h>
 									/*}}}*/
 
 using namespace std;
 
-
-
 // IndexCopy::CopyPackages - Copy the package files from the CD		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -53,75 +55,39 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
    bool Debug = _config->FindB("Debug::aptcdrom",false);
    
    // Prepare the progress indicator
-   unsigned long TotalSize = 0;
+   off_t TotalSize = 0;
+   std::vector<APT::Configuration::Compressor> const compressor = APT::Configuration::getCompressors();
    for (vector<string>::iterator I = List.begin(); I != List.end(); ++I)
    {
       struct stat Buf;
-      if (stat(string(*I + GetFileName()).c_str(),&Buf) != 0 &&
-	  stat(string(*I + GetFileName() + ".gz").c_str(),&Buf) != 0)
-	 return _error->Errno("stat","Stat failed for %s",
-			      string(*I + GetFileName()).c_str());
+      bool found = false;
+      std::string file = std::string(*I).append(GetFileName());
+      for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
+	   c != compressor.end(); ++c)
+      {
+	 if (stat(std::string(file + c->Extension).c_str(), &Buf) != 0)
+	    continue;
+	 found = true;
+	 break;
+      }
+
+      if (found == false)
+	 return _error->Errno("stat", "Stat failed for %s", file.c_str());
       TotalSize += Buf.st_size;
-   }	
+   }
 
-   unsigned long CurrentSize = 0;
+   off_t CurrentSize = 0;
    unsigned int NotFound = 0;
    unsigned int WrongSize = 0;
    unsigned int Packages = 0;
    for (vector<string>::iterator I = List.begin(); I != List.end(); ++I)
    {      
       string OrigPath = string(*I,CDROM.length());
-      unsigned long FileSize = 0;
       
       // Open the package file
-      FileFd Pkg;
-      if (RealFileExists(*I + GetFileName()) == true)
-      {
-	 Pkg.Open(*I + GetFileName(),FileFd::ReadOnly);
-	 FileSize = Pkg.Size();
-      }      
-      else
-      {
-	 FileFd From(*I + GetFileName() + ".gz",FileFd::ReadOnly);
-	 if (_error->PendingError() == true)
-	    return false;
-	 FileSize = From.Size();
-	 
-	 // Get a temp file
-	 FILE *tmp = tmpfile();
-	 if (tmp == 0)
-	    return _error->Errno("tmpfile","Unable to create a tmp file");
-	 Pkg.Fd(dup(fileno(tmp)));
-	 fclose(tmp);
-	 
-	 // Fork gzip
-	 pid_t Process = fork();
-	 if (Process < 0)
-	    return _error->Errno("fork","Couldn't fork gzip");
-	 
-	 // The child
-	 if (Process == 0)
-	 {	    
-	    dup2(From.Fd(),STDIN_FILENO);
-	    dup2(Pkg.Fd(),STDOUT_FILENO);
-	    SetCloseExec(STDIN_FILENO,false);
-	    SetCloseExec(STDOUT_FILENO,false);
-	    
-	    const char *Args[3];
-	    string Tmp =  _config->Find("Dir::bin::gzip","gzip");
-	    Args[0] = Tmp.c_str();
-	    Args[1] = "-d";
-	    Args[2] = 0;
-	    execvp(Args[0],(char **)Args);
-	    exit(100);
-	 }
-	 
-	 // Wait for gzip to finish
-	 if (ExecWait(Process,_config->Find("Dir::bin::gzip","gzip").c_str(),false) == false)
-	    return _error->Error("gzip failed, perhaps the disk is full.");
-	 
-	 Pkg.Seek(0);
-      }
+      FileFd Pkg(*I + GetFileName(), FileFd::ReadOnly, FileFd::Auto);
+      off_t const FileSize = Pkg.Size();
+
       pkgTagFile Parser(&Pkg);
       if (_error->PendingError() == true)
 	 return false;
@@ -164,7 +130,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
 	 if(Progress)
 	    Progress->Progress(Parser.Offset());
 	 string File;
-	 unsigned long Size;
+	 unsigned long long Size;
 	 if (GetFile(File,Size) == false)
 	 {
 	    fclose(TargetFl);
@@ -219,7 +185,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
 	    }	    
 	    			    	    
 	    // Size match
-	    if ((unsigned)Buf.st_size != Size)
+	    if ((unsigned long long)Buf.st_size != Size)
 	    {
 	       if (Debug == true)
 		  clog << "Wrong Size: " << File << endl;
@@ -453,7 +419,7 @@ bool IndexCopy::GrabFirst(string Path,string &To,unsigned int Depth)
 // PackageCopy::GetFile - Get the file information from the section	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool PackageCopy::GetFile(string &File,unsigned long &Size)
+bool PackageCopy::GetFile(string &File,unsigned long long &Size)
 {
    File = Section->FindS("Filename");
    Size = Section->FindI("Size");
@@ -479,7 +445,7 @@ bool PackageCopy::RewriteEntry(FILE *Target,string File)
 // SourceCopy::GetFile - Get the file information from the section	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool SourceCopy::GetFile(string &File,unsigned long &Size)
+bool SourceCopy::GetFile(string &File,unsigned long long &Size)
 {
    string Files = Section->FindS("Files");
    if (Files.empty() == true)
@@ -502,7 +468,7 @@ bool SourceCopy::GetFile(string &File,unsigned long &Size)
       return _error->Error("Error parsing file record");
    
    // Parse the size and append the directory
-   Size = atoi(sSize.c_str());
+   Size = strtoull(sSize.c_str(), NULL, 10);
    File = Base + File;
    return true;
 }
@@ -599,13 +565,19 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
 
       string const releasegpg = *I+"Release.gpg";
       string const release = *I+"Release";
+      string const inrelease = *I+"InRelease";
+      bool useInRelease = true;
 
       // a Release.gpg without a Release should never happen
-      if(RealFileExists(release) == false)
+      if (RealFileExists(inrelease) == true)
+	 ;
+      else if(RealFileExists(release) == false || RealFileExists(releasegpg) == false)
       {
 	 delete MetaIndex;
 	 continue;
       }
+      else
+	 useInRelease = false;
 
       pid_t pid = ExecFork();
       if(pid < 0) {
@@ -613,11 +585,16 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
 	 return false;
       }
       if(pid == 0)
-	 RunGPGV(release, releasegpg);
+      {
+	 if (useInRelease == true)
+	    RunGPGV(inrelease, inrelease);
+	 else
+	    RunGPGV(release, releasegpg);
+      }
 
       if(!ExecWait(pid, "gpgv")) {
 	 _error->Warning("Signature verification failed for: %s",
-			 releasegpg.c_str());
+			 (useInRelease ? inrelease.c_str() : releasegpg.c_str()));
 	 // something went wrong, don't copy the Release.gpg
 	 // FIXME: delete any existing gpg file?
 	 continue;
@@ -647,8 +624,13 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
       delete MetaIndex;
    
       // everything was fine, copy the Release and Release.gpg file
-      CopyMetaIndex(CDROM, Name, prefix, "Release");
-      CopyMetaIndex(CDROM, Name, prefix, "Release.gpg");
+      if (useInRelease == true)
+	 CopyMetaIndex(CDROM, Name, prefix, "InRelease");
+      else
+      {
+	 CopyMetaIndex(CDROM, Name, prefix, "Release");
+	 CopyMetaIndex(CDROM, Name, prefix, "Release.gpg");
+      }
    }   
 
    return true;
@@ -785,75 +767,39 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,	/*{{{*/
    bool Debug = _config->FindB("Debug::aptcdrom",false);
    
    // Prepare the progress indicator
-   unsigned long TotalSize = 0;
+   off_t TotalSize = 0;
+   std::vector<APT::Configuration::Compressor> const compressor = APT::Configuration::getCompressors();
    for (vector<string>::iterator I = List.begin(); I != List.end(); ++I)
    {
       struct stat Buf;
-      if (stat(string(*I).c_str(),&Buf) != 0 &&
-	  stat(string(*I + ".gz").c_str(),&Buf) != 0)
-	 return _error->Errno("stat","Stat failed for %s",
-			      string(*I).c_str());
+      bool found = false;
+      std::string file = *I;
+      for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin();
+	   c != compressor.end(); ++c)
+      {
+	 if (stat(std::string(file + c->Extension).c_str(), &Buf) != 0)
+	    continue;
+	 found = true;
+	 break;
+      }
+
+      if (found == false)
+	 return _error->Errno("stat", "Stat failed for %s", file.c_str());
       TotalSize += Buf.st_size;
-   }	
+   }
 
-   unsigned long CurrentSize = 0;
+   off_t CurrentSize = 0;
    unsigned int NotFound = 0;
    unsigned int WrongSize = 0;
    unsigned int Packages = 0;
    for (vector<string>::iterator I = List.begin(); I != List.end(); ++I)
    {      
       string OrigPath = string(*I,CDROM.length());
-      unsigned long FileSize = 0;
-      
+
       // Open the package file
-      FileFd Pkg;
-      if (RealFileExists(*I) == true)
-      {
-	 Pkg.Open(*I,FileFd::ReadOnly);
-	 FileSize = Pkg.Size();
-      }      
-      else
-      {
-	 FileFd From(*I + ".gz",FileFd::ReadOnly);
-	 if (_error->PendingError() == true)
-	    return false;
-	 FileSize = From.Size();
-	 
-	 // Get a temp file
-	 FILE *tmp = tmpfile();
-	 if (tmp == 0)
-	    return _error->Errno("tmpfile","Unable to create a tmp file");
-	 Pkg.Fd(dup(fileno(tmp)));
-	 fclose(tmp);
-	 
-	 // Fork gzip
-	 pid_t Process = fork();
-	 if (Process < 0)
-	    return _error->Errno("fork","Couldn't fork gzip");
-	 
-	 // The child
-	 if (Process == 0)
-	 {	    
-	    dup2(From.Fd(),STDIN_FILENO);
-	    dup2(Pkg.Fd(),STDOUT_FILENO);
-	    SetCloseExec(STDIN_FILENO,false);
-	    SetCloseExec(STDOUT_FILENO,false);
-	    
-	    const char *Args[3];
-	    string Tmp =  _config->Find("Dir::bin::gzip","gzip");
-	    Args[0] = Tmp.c_str();
-	    Args[1] = "-d";
-	    Args[2] = 0;
-	    execvp(Args[0],(char **)Args);
-	    exit(100);
-	 }
-	 
-	 // Wait for gzip to finish
-	 if (ExecWait(Process,_config->Find("Dir::bin::gzip","gzip").c_str(),false) == false)
-	    return _error->Error("gzip failed, perhaps the disk is full.");
-	 
-	 Pkg.Seek(0);
-      }
+      FileFd Pkg(*I, FileFd::ReadOnly, FileFd::Auto);
+      off_t const FileSize = Pkg.Size();
+
       pkgTagFile Parser(&Pkg);
       if (_error->PendingError() == true)
 	 return false;
diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index 6fcd3b8ce..e3de1afd9 100644
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -14,8 +14,10 @@
 #include <string>
 #include <stdio.h>
 
+#ifndef APT_8_CLEANER_HEADERS
 using std::string;
 using std::vector;
+#endif
 
 class pkgTagSection;
 class FileFd;
@@ -24,24 +26,27 @@ class pkgCdromStatus;
 
 class IndexCopy								/*{{{*/
 {
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+
    protected:
    
    pkgTagSection *Section;
    
-   string ChopDirs(string Path,unsigned int Depth);
-   bool ReconstructPrefix(string &Prefix,string OrigPath,string CD,
-			  string File);
-   bool ReconstructChop(unsigned long &Chop,string Dir,string File);
-   void ConvertToSourceList(string CD,string &Path);
-   bool GrabFirst(string Path,string &To,unsigned int Depth);
-   virtual bool GetFile(string &Filename,unsigned long &Size) = 0;
-   virtual bool RewriteEntry(FILE *Target,string File) = 0;
+   std::string ChopDirs(std::string Path,unsigned int Depth);
+   bool ReconstructPrefix(std::string &Prefix,std::string OrigPath,std::string CD,
+			  std::string File);
+   bool ReconstructChop(unsigned long &Chop,std::string Dir,std::string File);
+   void ConvertToSourceList(std::string CD,std::string &Path);
+   bool GrabFirst(std::string Path,std::string &To,unsigned int Depth);
+   virtual bool GetFile(std::string &Filename,unsigned long long &Size) = 0;
+   virtual bool RewriteEntry(FILE *Target,std::string File) = 0;
    virtual const char *GetFileName() = 0;
    virtual const char *Type() = 0;
    
    public:
 
-   bool CopyPackages(string CDROM,string Name,vector<string> &List,
+   bool CopyPackages(std::string CDROM,std::string Name,std::vector<std::string> &List,
 		     pkgCdromStatus *log);
    virtual ~IndexCopy() {};
 };
@@ -50,24 +55,22 @@ class PackageCopy : public IndexCopy					/*{{{*/
 {
    protected:
    
-   virtual bool GetFile(string &Filename,unsigned long &Size);
-   virtual bool RewriteEntry(FILE *Target,string File);
+   virtual bool GetFile(std::string &Filename,unsigned long long &Size);
+   virtual bool RewriteEntry(FILE *Target,std::string File);
    virtual const char *GetFileName() {return "Packages";};
    virtual const char *Type() {return "Package";};
    
-   public:
 };
 									/*}}}*/
 class SourceCopy : public IndexCopy					/*{{{*/
 {
    protected:
    
-   virtual bool GetFile(string &Filename,unsigned long &Size);
-   virtual bool RewriteEntry(FILE *Target,string File);
+   virtual bool GetFile(std::string &Filename,unsigned long long &Size);
+   virtual bool RewriteEntry(FILE *Target,std::string File);
    virtual const char *GetFileName() {return "Sources";};
    virtual const char *Type() {return "Source";};
    
-   public:
 };
 									/*}}}*/
 class TranslationsCopy							/*{{{*/
@@ -76,19 +79,22 @@ class TranslationsCopy							/*{{{*/
    pkgTagSection *Section;
 
    public:
-   bool CopyTranslations(string CDROM,string Name,vector<string> &List,
+   bool CopyTranslations(std::string CDROM,std::string Name,std::vector<std::string> &List,
 			 pkgCdromStatus *log);
 };
 									/*}}}*/
 class SigVerify								/*{{{*/
 {
-   bool Verify(string prefix,string file, indexRecords *records);
-   bool CopyMetaIndex(string CDROM, string CDName, 
-		      string prefix, string file);
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
+
+   bool Verify(std::string prefix,std::string file, indexRecords *records);
+   bool CopyMetaIndex(std::string CDROM, std::string CDName, 
+		      std::string prefix, std::string file);
 
  public:
-   bool CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
-		      vector<string> PkgList,vector<string> SrcList);
+   bool CopyAndVerify(std::string CDROM,std::string Name,std::vector<std::string> &SigList,
+		      std::vector<std::string> PkgList,std::vector<std::string> SrcList);
 
    /** \brief generates and run the command to verify a file with gpgv */
    static bool RunGPGV(std::string const &File, std::string const &FileOut,
diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index f18ddbfaa..642a750d4 100644
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -8,6 +8,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/aptconfiguration.h>
@@ -45,9 +47,9 @@ pkgIndexFile::Type *pkgIndexFile::Type::GetType(const char *Type)
 // IndexFile::ArchiveInfo - Stub					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-string pkgIndexFile::ArchiveInfo(pkgCache::VerIterator Ver) const
+std::string pkgIndexFile::ArchiveInfo(pkgCache::VerIterator Ver) const
 {
-   return string();
+   return std::string();
 }
 									/*}}}*/
 // IndexFile::FindInCache - Stub					/*{{{*/
@@ -61,10 +63,10 @@ pkgCache::PkgFileIterator pkgIndexFile::FindInCache(pkgCache &Cache) const
 // IndexFile::SourceIndex - Stub					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &Record,
+std::string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &Record,
 				pkgSrcRecords::File const &File) const
 {
-   return string();
+   return std::string();
 }
 									/*}}}*/
 // IndexFile::TranslationsAvailable - Check if will use Translation	/*{{{*/
@@ -96,7 +98,7 @@ __attribute__ ((deprecated)) bool pkgIndexFile::CheckLanguageCode(const char *La
 /* As we have now possibly more than one LanguageCode this method is
    supersided by a) private classmembers or b) getLanguages().
    TODO: Remove method with next API break */
-__attribute__ ((deprecated)) string pkgIndexFile::LanguageCode() {
+__attribute__ ((deprecated)) std::string pkgIndexFile::LanguageCode() {
 	if (TranslationsAvailable() == false)
 		return "";
 	return APT::Configuration::getLanguages()[0];
diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index 2b5ae6342..1d34dc773 100644
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -27,12 +27,16 @@
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/pkgrecords.h>
-    
+#include <apt-pkg/macros.h>
+
+#ifndef APT_8_CLEANER_HEADERS
 using std::string;
+#endif
 
 class pkgAcquire;
 class pkgCacheGenerator;
 class OpProgress;
+
 class pkgIndexFile
 {
    protected:
@@ -59,13 +63,13 @@ class pkgIndexFile
    virtual const Type *GetType() const = 0;
    
    // Return descriptive strings of various sorts
-   virtual string ArchiveInfo(pkgCache::VerIterator Ver) const;
-   virtual string SourceInfo(pkgSrcRecords::Parser const &Record,
+   virtual std::string ArchiveInfo(pkgCache::VerIterator Ver) const;
+   virtual std::string SourceInfo(pkgSrcRecords::Parser const &Record,
 			     pkgSrcRecords::File const &File) const;
-   virtual string Describe(bool Short = false) const = 0;   
+   virtual std::string Describe(bool Short = false) const = 0;   
 
    // Interface for acquire
-   virtual string ArchiveURI(string /*File*/) const {return string();};
+   virtual std::string ArchiveURI(std::string /*File*/) const {return std::string();};
 
    // Interface for the record parsers
    virtual pkgSrcRecords::Parser *CreateSrcParser() const {return 0;};
@@ -84,7 +88,7 @@ class pkgIndexFile
 
    static bool TranslationsAvailable();
    static bool CheckLanguageCode(const char *Lang);
-   static string LanguageCode();
+   static std::string LanguageCode();
 
    bool IsTrusted() const { return Trusted; };
    
diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index ba5b7c846..af2639beb 100644
--- a/apt-pkg/indexrecords.cc
+++ b/apt-pkg/indexrecords.cc
@@ -3,16 +3,24 @@
 // $Id: indexrecords.cc,v 1.1.2.4 2003/12/30 02:11:43 mdz Exp $
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/indexrecords.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
-#include <apti18n.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/hashes.h>
+
 #include <sys/stat.h>
 #include <clocale>
 
+#include <apti18n.h>
 									/*}}}*/
+
+using std::string;
+
 string indexRecords::GetDist() const
 {
    return this->Dist;
@@ -36,7 +44,10 @@ time_t indexRecords::GetValidUntil() const
 
 const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)
 {
-   return Entries[MetaKey];
+   std::map<std::string, indexRecords::checkSum* >::const_iterator sum = Entries.find(MetaKey);
+   if (sum == Entries.end())
+      return NULL;
+   return sum->second;
 }
 
 bool indexRecords::Exists(string const &MetaKey) const
@@ -78,7 +89,7 @@ bool indexRecords::Load(const string Filename)				/*{{{*/
 
       string Name;
       string Hash;
-      size_t Size;
+      unsigned long long Size;
       while (Start < End)
       {
 	 if (!parseSumData(Start, End, Name, Hash, Size))
@@ -144,7 +155,7 @@ bool indexRecords::Load(const string Filename)				/*{{{*/
    return true;
 }
 									/*}}}*/
-vector<string> indexRecords::MetaKeys()					/*{{{*/
+std::vector<string> indexRecords::MetaKeys()				/*{{{*/
 {
    std::vector<std::string> keys;
    std::map<string,checkSum *>::iterator I = Entries.begin();
@@ -156,7 +167,7 @@ vector<string> indexRecords::MetaKeys()					/*{{{*/
 }
 									/*}}}*/
 bool indexRecords::parseSumData(const char *&Start, const char *End,	/*{{{*/
-				   string &Name, string &Hash, size_t &Size)
+				   string &Name, string &Hash, unsigned long long &Size)
 {
    Name = "";
    Hash = "";
@@ -193,7 +204,7 @@ bool indexRecords::parseSumData(const char *&Start, const char *End,	/*{{{*/
    if (EntryEnd == End)
       return false;
    
-   Size = strtol (Start, NULL, 10);
+   Size = strtoull (Start, NULL, 10);
       
    /* Skip over intermediate blanks */
    Start = EntryEnd;
diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h
index 5b532c1a5..a98b939bc 100644
--- a/apt-pkg/indexrecords.h
+++ b/apt-pkg/indexrecords.h
@@ -7,53 +7,56 @@
 
 
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/fileutl.h>
 #include <apt-pkg/hashes.h>
 
 #include <map>
 #include <vector>
 #include <ctime>
 
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/fileutl.h>
+#endif
+
 class indexRecords
 {
-   bool parseSumData(const char *&Start, const char *End, string &Name,
-		     string &Hash, size_t &Size);
+   bool parseSumData(const char *&Start, const char *End, std::string &Name,
+		     std::string &Hash, unsigned long long &Size);
    public:
    struct checkSum;
-   string ErrorText;
+   std::string ErrorText;
    
    protected:
-   string Dist;
-   string Suite;
-   string ExpectedDist;
+   std::string Dist;
+   std::string Suite;
+   std::string ExpectedDist;
    time_t ValidUntil;
 
-   std::map<string,checkSum *> Entries;
+   std::map<std::string,checkSum *> Entries;
 
    public:
 
    indexRecords();
-   indexRecords(const string ExpectedDist);
+   indexRecords(const std::string ExpectedDist);
 
    // Lookup function
-   virtual const checkSum *Lookup(const string MetaKey);
+   virtual const checkSum *Lookup(const std::string MetaKey);
    /** \brief tests if a checksum for this file is available */
-   bool Exists(string const &MetaKey) const;
+   bool Exists(std::string const &MetaKey) const;
    std::vector<std::string> MetaKeys();
 
-   virtual bool Load(string Filename);
-   string GetDist() const;
+   virtual bool Load(std::string Filename);
+   std::string GetDist() const;
    time_t GetValidUntil() const;
-   virtual bool CheckDist(const string MaybeDist) const;
-   string GetExpectedDist() const;
+   virtual bool CheckDist(const std::string MaybeDist) const;
+   std::string GetExpectedDist() const;
    virtual ~indexRecords(){};
 };
 
 struct indexRecords::checkSum
 {
-   string MetaKeyFilename;
+   std::string MetaKeyFilename;
    HashString Hash;
-   size_t Size;      
+   unsigned long long Size;
 };
 
 #endif
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index b283e2dd9..76278921f 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -8,19 +8,23 @@
    ##################################################################### */
 									/*}}}*/
 // Include files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/init.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/configuration.h>
 
-#include <apti18n.h>
-#include <config.h>
 #include <cstdlib>
 #include <sys/stat.h>
+
+#include <apti18n.h>
 									/*}}}*/
 
 #define Stringfy_(x) # x
 #define Stringfy(x)  Stringfy_(x)
-const char *pkgVersion = VERSION;
+const char *pkgVersion = PACKAGE_VERSION;
 const char *pkgLibVersion = Stringfy(APT_PKG_MAJOR) "."
                             Stringfy(APT_PKG_MINOR) "." 
                             Stringfy(APT_PKG_RELEASE);
@@ -74,6 +78,7 @@ bool pkgInitConfig(Configuration &Cnf)
    Cnf.CndSet("Dir::Etc::trusted", "trusted.gpg");
    Cnf.CndSet("Dir::Etc::trustedparts","trusted.gpg.d");
    Cnf.CndSet("Dir::Bin::methods","/usr/lib/apt/methods");
+   Cnf.CndSet("Dir::Bin::solvers::","/usr/lib/apt/solvers");
    Cnf.CndSet("Dir::Media::MountPath","/media/apt");
 
    // State   
@@ -104,14 +109,14 @@ bool pkgInitConfig(Configuration &Cnf)
    }
 
    // Read the configuration parts dir
-   string Parts = Cnf.FindDir("Dir::Etc::parts");
+   std::string Parts = Cnf.FindDir("Dir::Etc::parts");
    if (DirectoryExists(Parts) == true)
       Res &= ReadConfigDir(Cnf,Parts);
    else
       _error->WarningE("DirectoryExists",_("Unable to read %s"),Parts.c_str());
 
    // Read the main config file
-   string FName = Cnf.FindFile("Dir::Etc::main");
+   std::string FName = Cnf.FindFile("Dir::Etc::main");
    if (RealFileExists(FName) == true)
       Res &= ReadConfigFile(Cnf,FName);
 
@@ -138,7 +143,7 @@ bool pkgInitConfig(Configuration &Cnf)
 bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys)
 {
    Sys = 0;
-   string Label = Cnf.Find("Apt::System","");
+   std::string Label = Cnf.Find("Apt::System","");
    if (Label.empty() == false)
    {
       Sys = pkgSystem::GetSystem(Label.c_str());
diff --git a/apt-pkg/init.h b/apt-pkg/init.h
index 15a1165b9..b6f3df753 100644
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@ -13,8 +13,13 @@
 #ifndef PKGLIB_INIT_H
 #define PKGLIB_INIT_H
 
+#ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/pkgsystem.h>
+#endif
+
+class pkgSystem;
+class Configuration;
 
 // These lines are extracted by the makefiles and the buildsystem
 // Increasing MAJOR or MINOR results in the need of recompiling all
@@ -22,8 +27,8 @@
 // Non-ABI-Breaks should only increase RELEASE number.
 // See also buildlib/libversion.mak
 #define APT_PKG_MAJOR 4
-#define APT_PKG_MINOR 10
-#define APT_PKG_RELEASE 1
+#define APT_PKG_MINOR 12
+#define APT_PKG_RELEASE 0
     
 extern const char *pkgVersion;
 extern const char *pkgLibVersion;
@@ -31,15 +36,4 @@ extern const char *pkgLibVersion;
 bool pkgInitConfig(Configuration &Cnf);
 bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys);
 
-#ifdef APT_COMPATIBILITY
-#if APT_COMPATIBILITY != 986
-#warning "Using APT_COMPATIBILITY"
-#endif
-
-inline bool pkgInitialize(Configuration &Cnf) 
-{
-   return pkgInitConfig(Cnf) && pkgInitSystem(Cnf,_system);
-};
-#endif
-
 #endif
diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index 4e5ec107f..27d7ead24 100644
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -3,7 +3,7 @@ BASE=..
 SUBDIR=apt-pkg
 
 # Header location
-SUBDIRS = deb contrib
+SUBDIRS = deb edsp contrib
 HEADER_TARGETDIRS = apt-pkg
 
 # Bring in the default rules
@@ -14,17 +14,27 @@ include ../buildlib/libversion.mak
 LIBRARY=apt-pkg
 MAJOR=$(LIBAPTPKG_MAJOR)
 MINOR=$(LIBAPTPKG_RELEASE)
-SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl -lz
+SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl
+ifeq ($(HAVE_ZLIB),yes)
+SLIBS+= -lz
+endif
+ifeq ($(HAVE_BZ2),yes)
+SLIBS+= -lbz2
+endif
 APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR)
 
 # Source code for the contributed non-core things
 SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \
          contrib/configuration.cc contrib/progress.cc contrib/cmndline.cc \
-	 contrib/md5.cc contrib/sha1.cc contrib/sha256.cc contrib/hashes.cc \
+	 contrib/hashsum.cc contrib/md5.cc contrib/sha1.cc \
+	 contrib/sha2_internal.cc\
+         contrib/hashes.cc \
 	 contrib/cdromutl.cc contrib/crc-16.cc contrib/netrc.cc \
 	 contrib/fileutl.cc 
 HEADERS = mmap.h error.h configuration.h fileutl.h  cmndline.h netrc.h\
-	  md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h \
+	  md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha2.h sha256.h\
+	  sha2_internal.h \
+          hashes.h hashsum_template.h\
 	  macros.h weakptr.h
 
 # Source code for the core main library
@@ -35,7 +45,7 @@ SOURCE+= pkgcache.cc version.cc depcache.cc \
 	 srcrecords.cc cachefile.cc versionmatch.cc policy.cc \
 	 pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc \
 	 indexrecords.cc vendor.cc vendorlist.cc cdrom.cc indexcopy.cc \
-	 aptconfiguration.cc cachefilter.cc cacheset.cc
+	 aptconfiguration.cc cachefilter.cc cacheset.cc edsp.cc
 HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \
 	  orderlist.h sourcelist.h packagemanager.h tagfile.h \
 	  init.h pkgcache.h version.h progress.h pkgrecords.h \
@@ -43,7 +53,7 @@ HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \
 	  clean.h srcrecords.h cachefile.h versionmatch.h policy.h \
 	  pkgsystem.h indexfile.h metaindex.h indexrecords.h vendor.h \
 	  vendorlist.h cdrom.h indexcopy.h aptconfiguration.h \
-	  cachefilter.h cacheset.h
+	  cachefilter.h cacheset.h edsp.h
 
 # Source code for the debian specific components
 # In theory the deb headers do not need to be exported..
@@ -53,6 +63,10 @@ SOURCE+= deb/deblistparser.cc deb/debrecords.cc deb/dpkgpm.cc \
 HEADERS+= debversion.h debsrcrecords.h dpkgpm.h debrecords.h \
 	  deblistparser.h debsystem.h debindexfile.h debmetaindex.h
 
+# Source code for the APT resolver interface specific components
+SOURCE+= edsp/edsplistparser.cc edsp/edspindexfile.cc edsp/edspsystem.cc
+HEADERS+= edsplistparser.h edspindexfile.h edspsystem.h
+
 HEADERS := $(addprefix apt-pkg/,$(HEADERS))
 
 include $(LIBRARY_H)
diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h
index 1d2140799..5783735ff 100644
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -4,12 +4,14 @@
 
 #include <string>
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/indexfile.h>
+
+#ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/indexfile.h>
 #include <apt-pkg/vendor.h>
-    
 using std::string;
+#endif
 
 class pkgAcquire;
 class pkgCacheGenerator;
@@ -18,31 +20,35 @@ class OpProgress;
 class metaIndex
 {
    protected:
-   vector <pkgIndexFile *> *Indexes;
+   std::vector <pkgIndexFile *> *Indexes;
    const char *Type;
-   string URI;
-   string Dist;
+   std::string URI;
+   std::string Dist;
    bool Trusted;
 
    public:
 
    
    // Various accessors
-   virtual string GetURI() const {return URI;}
-   virtual string GetDist() const {return Dist;}
+   virtual std::string GetURI() const {return URI;}
+   virtual std::string GetDist() const {return Dist;}
    virtual const char* GetType() const {return Type;}
 
    // Interface for acquire
-   virtual string ArchiveURI(string const& /*File*/) const = 0;
+   virtual std::string ArchiveURI(std::string const& /*File*/) const = 0;
    virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) const = 0;
    
-   virtual vector<pkgIndexFile *> *GetIndexFiles() = 0; 
+   virtual std::vector<pkgIndexFile *> *GetIndexFiles() = 0; 
    virtual bool IsTrusted() const = 0;
 
+   metaIndex(std::string const &URI, std::string const &Dist, char const * const Type) :
+		Indexes(NULL), Type(Type), URI(URI), Dist(Dist) {
+   }
+
    virtual ~metaIndex() {
       if (Indexes == 0)
 	 return;
-      for (vector<pkgIndexFile *>::iterator I = (*Indexes).begin(); I != (*Indexes).end(); ++I)
+      for (std::vector<pkgIndexFile *>::iterator I = (*Indexes).begin(); I != (*Indexes).end(); ++I)
 	 delete *I;
       delete Indexes;
    }
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index cae5b0a48..3a179b2a2 100644
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -63,6 +63,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/orderlist.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/error.h>
@@ -80,16 +82,14 @@ pkgOrderList *pkgOrderList::Me = 0;
 // OrderList::pkgOrderList - Constructor				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-pkgOrderList::pkgOrderList(pkgDepCache *pCache) : Cache(*pCache)
+pkgOrderList::pkgOrderList(pkgDepCache *pCache) : Cache(*pCache),
+						  Primary(NULL), Secondary(NULL),
+						  RevDepends(NULL), Remove(NULL),
+						  AfterEnd(NULL), FileList(NULL),
+						  LoopCount(-1), Depth(0)
 {
-   FileList = 0;
-   Primary = 0;
-   Secondary = 0;
-   RevDepends = 0;
-   Remove = 0;
-   LoopCount = -1;
    Debug = _config->FindB("Debug::pkgOrderList",false);
-   
+
    /* Construct the arrays, egcs 1.0.1 bug requires the package count
       hack */
    unsigned long Size = Cache.Head().PackageCount;
@@ -1057,8 +1057,10 @@ bool pkgOrderList::AddLoop(DepIterator D)
    Loops[LoopCount++] = D;
    
    // Mark the packages as being part of a loop.
-   Flag(D.TargetPkg(),Loop);
-   Flag(D.ParentPkg(),Loop);
+   //Flag(D.TargetPkg(),Loop);
+   //Flag(D.ParentPkg(),Loop);
+   /* This is currently disabled because the Loop flag is being used for
+      loop management in the package manager. Check the orderlist.h file for more info */
    return true;
 }
 									/*}}}*/
@@ -1109,7 +1111,7 @@ bool pkgOrderList::CheckDep(DepIterator D)
          just needs one */
       if (D.IsNegative() == false)
       {
-	 // ignore provides by older versions of this package
+      	 // ignore provides by older versions of this package
 	 if (((D.Reverse() == false && Pkg == D.ParentPkg()) ||
 	      (D.Reverse() == true && Pkg == D.TargetPkg())) &&
 	     Cache[Pkg].InstallVer != *I)
diff --git a/apt-pkg/orderlist.h b/apt-pkg/orderlist.h
index 264f7ba03..a2d7b321b 100644
--- a/apt-pkg/orderlist.h
+++ b/apt-pkg/orderlist.h
@@ -38,7 +38,7 @@ class pkgOrderList : protected pkgCache::Namespace
    Package **End;
    Package **List;
    Package **AfterEnd;
-   string *FileList;
+   std::string *FileList;
    DepIterator Loops[20];
    int LoopCount;
    int Depth;
@@ -76,7 +76,12 @@ class pkgOrderList : protected pkgCache::Namespace
 
    typedef Package **iterator;
    
-   // State flags
+   /* State flags
+      The Loop flag can be set on a package that is currently being processed by either SmartConfigure or
+      SmartUnPack. This allows the package manager to tell when a loop has been formed as it will try to 
+      SmartUnPack or SmartConfigure a package with the Loop flag set. It will then either stop (as it knows
+      that the operation is unnecessary as its already in process), or in the case of the conflicts resolution
+      in SmartUnPack, use EarlyRemove to resolve the situation.  */
    enum Flags {Added = (1 << 0), AddPending = (1 << 1),
                Immediate = (1 << 2), Loop = (1 << 3),
                UnPacked = (1 << 4), Configured = (1 << 5),
@@ -91,10 +96,13 @@ class pkgOrderList : protected pkgCache::Namespace
    void Flag(PkgIterator Pkg,unsigned long State, unsigned long F) {Flags[Pkg->ID] = (Flags[Pkg->ID] & (~F)) | State;};
    inline void Flag(PkgIterator Pkg,unsigned long F) {Flags[Pkg->ID] |= F;};
    inline void Flag(Package *Pkg,unsigned long F) {Flags[Pkg->ID] |= F;};
+   // RmFlag removes a flag from a package 
+   inline void RmFlag(Package *Pkg,unsigned long F) {Flags[Pkg->ID] &= ~F;};
+   // IsNow will return true if the Pkg has been not been either configured or unpacked
    inline bool IsNow(PkgIterator Pkg) {return (Flags[Pkg->ID] & (States & (~Removed))) == 0;};
    bool IsMissing(PkgIterator Pkg);
    void WipeFlags(unsigned long F);
-   void SetFileList(string *FileList) {this->FileList = FileList;};
+   void SetFileList(std::string *FileList) {this->FileList = FileList;};
 
    // Accessors
    inline iterator begin() {return List;};
@@ -107,7 +115,7 @@ class pkgOrderList : protected pkgCache::Namespace
    
    // Ordering modes
    bool OrderCritical();
-   bool OrderUnpack(string *FileList = 0);
+   bool OrderUnpack(std::string *FileList = 0);
    bool OrderConfigure();
 
    int Score(PkgIterator Pkg);
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 8b73b9980..c62c4d187 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -13,6 +13,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/orderlist.h>
 #include <apt-pkg/depcache.h>
@@ -22,21 +24,25 @@
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/sptr.h>
-    
-#include <apti18n.h>    
+
+#include <apti18n.h>
 #include <iostream>
-#include <fcntl.h> 
+#include <fcntl.h>
 									/*}}}*/
 using namespace std;
 
+bool pkgPackageManager::SigINTStop = false;
+
 // PM::PackageManager - Constructor					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-pkgPackageManager::pkgPackageManager(pkgDepCache *pCache) : Cache(*pCache)
+pkgPackageManager::pkgPackageManager(pkgDepCache *pCache) : Cache(*pCache),
+							    List(NULL), Res(Incomplete)
 {
    FileNames = new string[Cache.Head().PackageCount];
-   List = 0;
    Debug = _config->FindB("Debug::pkgPackageManager",false);
+   NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true);
+   ImmConfigureAll = _config->FindB("APT::Immediate-Configure-All",false);
 }
 									/*}}}*/
 // PM::PackageManager - Destructor					/*{{{*/
@@ -146,7 +152,7 @@ void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer, unsigned
 	 if(!List->IsFlag(D.TargetPkg(), pkgOrderList::Immediate))
 	 {
 	    if(Debug)
-	       clog << OutputInDepth(Depth) << "ImmediateAdd(): Adding Immediate flag to " << D.TargetPkg() << " cause of " << D.DepType() << " " << I.Name() << endl;
+	       clog << OutputInDepth(Depth) << "ImmediateAdd(): Adding Immediate flag to " << D.TargetPkg() << " cause of " << D.DepType() << " " << I.FullName() << endl;
 	    List->Flag(D.TargetPkg(),pkgOrderList::Immediate);
 	    ImmediateAdd(D.TargetPkg(), UseInstallVer, Depth + 1);
 	 }
@@ -165,8 +171,9 @@ bool pkgPackageManager::CreateOrderList()
    
    delete List;
    List = new pkgOrderList(&Cache);
-   
-   static bool const NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true);
+
+   if (Debug && ImmConfigureAll) 
+      clog << "CreateOrderList(): Adding Immediate flag for all packages because of APT::Immediate-Configure-All" << endl;
    
    // Generate the list of affected packages and sort it
    for (PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I)
@@ -176,19 +183,20 @@ bool pkgPackageManager::CreateOrderList()
 	 continue;
       
       // Mark the package and its dependends for immediate configuration
-      if (((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential ||
-	   (I->Flags & pkgCache::Flag::Important) == pkgCache::Flag::Important) &&
-	  NoImmConfigure == false)
+      if ((((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) &&
+	  NoImmConfigure == false) || ImmConfigureAll)
       {
-	 if(Debug)
-	    clog << "CreateOrderList(): Adding Immediate flag for " << I.Name() << endl;
+	 if(Debug && !ImmConfigureAll)
+	    clog << "CreateOrderList(): Adding Immediate flag for " << I.FullName() << endl;
 	 List->Flag(I,pkgOrderList::Immediate);
-
-	 // Look for other install packages to make immediate configurea
-	 ImmediateAdd(I, true);
 	 
-	 // And again with the current version.
-	 ImmediateAdd(I, false);
+	 if (!ImmConfigureAll) {
+	    // Look for other install packages to make immediate configurea
+	    ImmediateAdd(I, true);
+	  
+	    // And again with the current version.
+	    ImmediateAdd(I, false);
+	 }
       }
       
       // Not interesting
@@ -240,7 +248,7 @@ bool pkgPackageManager::CheckRConflicts(PkgIterator Pkg,DepIterator D,
 	 continue;
       
       // Ignore self conflicts, ignore conflicts from irrelevent versions
-      if (D.ParentPkg() == Pkg || D.ParentVer() != D.ParentPkg().CurrentVer())
+      if (D.IsIgnorable(Pkg) || D.ParentVer() != D.ParentPkg().CurrentVer())
 	 continue;
       
       if (Cache.VS().CheckDep(Ver,D->CompareOp,D.TargetVer()) == false)
@@ -248,7 +256,7 @@ bool pkgPackageManager::CheckRConflicts(PkgIterator Pkg,DepIterator D,
 
       if (EarlyRemove(D.ParentPkg()) == false)
 	 return _error->Error("Reverse conflicts early remove for package '%s' failed",
-			      Pkg.Name());
+			      Pkg.FullName().c_str());
    }
    return true;
 }
@@ -256,7 +264,8 @@ bool pkgPackageManager::CheckRConflicts(PkgIterator Pkg,DepIterator D,
 // PM::ConfigureAll - Run the all out configuration			/*{{{*/
 // ---------------------------------------------------------------------
 /* This configures every package. It is assumed they are all unpacked and
-   that the final configuration is valid. */
+   that the final configuration is valid. This is also used to catch packages
+   that have not been configured when using ImmConfigureAll */
 bool pkgPackageManager::ConfigureAll()
 {
    pkgOrderList OList(&Cache);
@@ -277,9 +286,19 @@ bool pkgPackageManager::ConfigureAll()
    for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); ++I)
    {
       PkgIterator Pkg(Cache,*I);
+      
+      /* Check if the package has been configured, this can happen if SmartConfigure
+         calls its self */ 
+      if (List->IsFlag(Pkg,pkgOrderList::Configured)) continue;
 
-      if (ConfigurePkgs == true && Configure(Pkg) == false)
+      if (ConfigurePkgs == true && SmartConfigure(Pkg, 0) == false) {
+         if (ImmConfigureAll)
+            _error->Error(_("Could not perform immediate configuration on '%s'. "
+			"Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.FullName().c_str(),1);
+         else
+            _error->Error("Internal error, packages left unconfigured. %s",Pkg.FullName().c_str());
 	 return false;
+      }
       
       List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
    }
@@ -289,37 +308,185 @@ bool pkgPackageManager::ConfigureAll()
 									/*}}}*/
 // PM::SmartConfigure - Perform immediate configuration of the pkg	/*{{{*/
 // ---------------------------------------------------------------------
-/* This routine scheduals the configuration of the given package and all
-   of it's dependents. */
-bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
+/* This function tries to put the system in a state where Pkg can be configured.
+   This involves checking each of Pkg's dependanies and unpacking and 
+   configuring packages where needed. 
+   
+   Note on failure: This method can fail, without causing any problems. 
+   This can happen when using Immediate-Configure-All, SmartUnPack may call
+   SmartConfigure, it may fail because of a complex dependancy situation, but
+   a error will only be reported if ConfigureAll fails. This is why some of the
+   messages this function reports on failure (return false;) as just warnings
+   only shown when debuging*/
+bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
 {
-   if (Debug == true)
-      clog << "SmartConfigure " << Pkg.Name() << endl;
+   // If this is true, only check and correct and dependencies without the Loop flag
+   bool const PkgLoop = List->IsFlag(Pkg,pkgOrderList::Loop);
 
-   pkgOrderList OList(&Cache);
+   if (Debug) {
+      VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer);
+      clog << OutputInDepth(Depth) << "SmartConfigure " << Pkg.FullName() << " (" << InstallVer.VerStr() << ")";
+      if (PkgLoop)
+        clog << " (Only Correct Dependencies)";
+      clog << endl;
+   }
+
+   VerIterator const instVer = Cache[Pkg].InstVerIter(Cache);
+      
+   /* Because of the ordered list, most dependencies should be unpacked, 
+      however if there is a loop (A depends on B, B depends on A) this will not 
+      be the case, so check for dependencies before configuring. */
+   bool Bad = false, Changed = false;
+   const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500);
+   unsigned int i=0;
+   do
+   {
+      Changed = false;
+      for (DepIterator D = instVer.DependsList(); D.end() == false; )
+      {
+	 // Compute a single dependency element (glob or)
+	 pkgCache::DepIterator Start, End;
+	 D.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();
+
+	    for (Version **I = VList; *I != 0; ++I)
+	    {
+	       VerIterator Ver(Cache,*I);
+	       PkgIterator DepPkg = Ver.ParentPkg();
+
+	       // Check if the current version of the package is available and will satisfy this dependency
+	       if (DepPkg.CurrentVer() == Ver && List->IsNow(DepPkg) == true &&
+		   List->IsFlag(DepPkg,pkgOrderList::Removed) == false &&
+		   DepPkg.State() == PkgIterator::NeedsNothing)
+	       {
+		  Bad = false;
+		  break;
+	       }
+
+	       // Check if the version that is going to be installed will satisfy the dependency
+	       if (Cache[DepPkg].InstallVer != *I)
+		  continue;
+
+	       if (List->IsFlag(DepPkg,pkgOrderList::UnPacked))
+	       {
+		  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 (SmartConfigure(DepPkg, Depth + 1) == true)
+		  {
+		     Bad = false;
+		     if (List->IsFlag(DepPkg,pkgOrderList::Loop) == false)
+			Changed = true;
+		  }
+		  if (PkgLoop == false)
+		    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)
+	       break;
+         }
+
+	 if (Bad == false)
+	    continue;
+
+	 // Check for dependencies that have not been unpacked, probably due to loops.
+	 for (DepIterator Cur = Start; true; ++Cur)
+	 {
+	    SPtrArray<Version *> VList = Cur.AllTargets();
+
+	    for (Version **I = VList; *I != 0; ++I)
+	    {
+	       VerIterator Ver(Cache,*I);
+	       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)
+		  continue;
 
-   if (DepAdd(OList,Pkg) == false)
+	       if (PkgLoop == true)
+	       {
+		  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 (SmartUnPack(DepPkg, true, Depth + 1) == true)
+		  {
+		     Bad = false;
+		     if (List->IsFlag(DepPkg,pkgOrderList::Loop) == false)
+		        Changed = true;
+		  }
+		  if (PkgLoop == false)
+		     List->RmFlag(Pkg,pkgOrderList::Loop);
+		  if (Bad == false)
+		     break;
+	       }
+	    }
+
+	    if (Cur == End)
+	       break;
+	 }
+
+	 if (Bad == true && Changed == false && Debug == true)
+	    std::clog << OutputInDepth(Depth) << "Could not satisfy " << Start << std::endl;
+      }
+      if (i++ > max_loops)
+         return _error->Error("Internal error: MaxLoopCount reached in SmartUnPack for %s, aborting", Pkg.FullName().c_str());
+   } while (Changed == true);
+   
+   if (Bad) {
+      if (Debug)
+         _error->Warning(_("Could not configure '%s'. "),Pkg.FullName().c_str());
       return false;
+   }
+   
+   if (PkgLoop) return true;
 
    static std::string const conf = _config->Find("PackageManager::Configure","all");
    static bool const ConfigurePkgs = (conf == "all" || conf == "smart");
 
-   if (ConfigurePkgs == true)
-      if (OList.OrderConfigure() == false)
-	 return false;
+   if (List->IsFlag(Pkg,pkgOrderList::Configured)) 
+      return _error->Error("Internal configure error on '%s'.", Pkg.FullName().c_str());
 
-   // Perform the configuring
-   for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); ++I)
-   {
-      PkgIterator Pkg(Cache,*I);
-      
-      if (ConfigurePkgs == true && Configure(Pkg) == false)
-	 return false;
-      
-      List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
-   }
+   if (ConfigurePkgs == true && Configure(Pkg) == false)
+      return false;
+
+   List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
 
-   if (Cache[Pkg].InstVerIter(Cache)->MultiArch == pkgCache::Version::Same)
+   if ((Cache[Pkg].InstVerIter(Cache)->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same)
       for (PkgIterator P = Pkg.Group().PackageList();
 	   P.end() == false; P = Pkg.Group().NextPkg(P))
       {
@@ -327,97 +494,16 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
 	     Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer &&
 	      (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
 	    continue;
-	 SmartConfigure(P);
+	 SmartConfigure(P, (Depth +1));
       }
 
    // Sanity Check
    if (List->IsFlag(Pkg,pkgOrderList::Configured) == false)
-      return _error->Error(_("Could not perform immediate configuration on '%s'. "
-			"Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.Name(),1);
+      return _error->Error(_("Could not configure '%s'. "),Pkg.FullName().c_str());
 
    return true;
 }
 									/*}}}*/
-// PM::DepAdd - Add all dependents to the oder list			/*{{{*/
-// ---------------------------------------------------------------------
-/* This recursively adds all dependents to the order list */
-bool pkgPackageManager::DepAdd(pkgOrderList &OList,PkgIterator Pkg,int Depth)
-{
-   if (OList.IsFlag(Pkg,pkgOrderList::Added) == true)
-      return true;
-   if (List->IsFlag(Pkg,pkgOrderList::Configured) == true)
-      return true;
-   if (List->IsFlag(Pkg,pkgOrderList::UnPacked) == false)
-      return false;
-
-   if (Debug) 
-      std::clog << OutputInDepth(Depth) << "DepAdd: " << Pkg.Name() << std::endl;
-      
-   // Put the package on the list
-   OList.push_back(Pkg);
-   OList.Flag(Pkg,pkgOrderList::Added);
-   Depth++;
-
-   // Check the dependencies to see if they are all satisfied.
-   bool Bad = false;
-   for (DepIterator D = Cache[Pkg].InstVerIter(Cache).DependsList(); D.end() == false;)
-   {
-      if (D->Type != pkgCache::Dep::Depends && D->Type != pkgCache::Dep::PreDepends)
-      {
-	 ++D;
-	 continue;
-      }
-      
-      // Grok or groups
-      Bad = true;
-      for (bool LastOR = true; D.end() == false && LastOR == true; ++D)
-      {
-	 LastOR = (D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or;
-	 
-	 if (Bad == false)
-	    continue;
-
-	 SPtrArray<Version *> VList = D.AllTargets();
-	 for (Version **I = VList; *I != 0 && Bad == true; ++I)
-	 {
-	    VerIterator Ver(Cache,*I);
-	    PkgIterator Pkg = Ver.ParentPkg();
-
-	    // See if the current version is ok
-	    if (Pkg.CurrentVer() == Ver && List->IsNow(Pkg) == true && 
-		Pkg.State() == PkgIterator::NeedsNothing)
-	    {
-	       Bad = false;
-	       continue;
-	    }
-	    
-	    // Not the install version 
-	    if (Cache[Pkg].InstallVer != *I || 
-		(Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing))
-	       continue;
-	    
-	    if (List->IsFlag(Pkg,pkgOrderList::UnPacked) == true)
-	       Bad = !DepAdd(OList,Pkg,Depth);
-	    if (List->IsFlag(Pkg,pkgOrderList::Configured) == true)
-	       Bad = false;
-	 }
-      }
-      
-      if (Bad == true)
-      {
-	 if (Debug) 
-	    std::clog << OutputInDepth(Depth) << "DepAdd FAILS on: " << Pkg.Name() << std::endl;
-	 OList.Flag(Pkg,0,pkgOrderList::Added);
-	 OList.pop_back();
-	 Depth--;
-	 return false;
-      }
-   }
-   
-   Depth--;
-   return true;
-}
-									/*}}}*/
 // PM::EarlyRemove - Perform removal of packages before their time	/*{{{*/
 // ---------------------------------------------------------------------
 /* This is called to deal with conflicts arising from unpacking */
@@ -436,7 +522,8 @@ bool pkgPackageManager::EarlyRemove(PkgIterator Pkg)
 
    // Essential packages get special treatment
    bool IsEssential = false;
-   if ((Pkg->Flags & pkgCache::Flag::Essential) != 0)
+   if ((Pkg->Flags & pkgCache::Flag::Essential) != 0 ||
+       (Pkg->Flags & pkgCache::Flag::Important) != 0)
       IsEssential = true;
 
    /* Check for packages that are the dependents of essential packages and 
@@ -446,7 +533,8 @@ bool pkgPackageManager::EarlyRemove(PkgIterator Pkg)
       for (DepIterator D = Pkg.RevDependsList(); D.end() == false &&
 	   IsEssential == false; ++D)
 	 if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends)
-	    if ((D.ParentPkg()->Flags & pkgCache::Flag::Essential) != 0)
+	    if ((D.ParentPkg()->Flags & pkgCache::Flag::Essential) != 0 ||
+	        (D.ParentPkg()->Flags & pkgCache::Flag::Important) != 0)
 	       IsEssential = true;
    }
 
@@ -457,7 +545,7 @@ bool pkgPackageManager::EarlyRemove(PkgIterator Pkg)
 				"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."),Pkg.Name());
+				"APT::Force-LoopBreak option."),Pkg.FullName().c_str());
    }
    
    bool Res = SmartRemove(Pkg);
@@ -478,132 +566,289 @@ bool pkgPackageManager::SmartRemove(PkgIterator Pkg)
    List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
 
    return Remove(Pkg,(Cache[Pkg].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge);
-   return true;
 }
 									/*}}}*/
 // PM::SmartUnPack - Install helper					/*{{{*/
 // ---------------------------------------------------------------------
-/* This performs the task of handling pre-depends. */
+/* This puts the system in a state where it can Unpack Pkg, if Pkg is allready
+   unpacked, or when it has been unpacked, if Immediate==true it configures it. */
 bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
 {
-   return SmartUnPack(Pkg, true);
+   return SmartUnPack(Pkg, true, 0);
 }
-bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
+bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int const Depth)
 {
-   // Check if it is already unpacked
-   if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure &&
-       Cache[Pkg].Keep() == true)
-   {
-      List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
-      if (Immediate == true &&
-	  List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
-	 if (SmartConfigure(Pkg) == false)
-	    return _error->Error(_("Could not perform immediate configuration on already unpacked '%s'. "
-			"Please see man 5 apt.conf under APT::Immediate-Configure for details."),Pkg.Name());
-      return true;
+   bool PkgLoop = List->IsFlag(Pkg,pkgOrderList::Loop);
+
+   if (Debug) {
+      clog << OutputInDepth(Depth) << "SmartUnPack " << Pkg.FullName();
+      VerIterator InstallVer = VerIterator(Cache,Cache[Pkg].InstallVer);
+      if (Pkg.CurrentVer() == 0)
+        clog << " (install version " << InstallVer.VerStr() << ")";
+      else
+        clog << " (replace version " << Pkg.CurrentVer().VerStr() << " with " << InstallVer.VerStr() << ")";
+      if (PkgLoop)
+        clog << " (Only Perform PreUnpack Checks)";
+      clog << endl;
    }
 
    VerIterator const instVer = Cache[Pkg].InstVerIter(Cache);
 
-   /* See if this packages install version has any predependencies
-      that are not met by 'now' packages. */
-   for (DepIterator D = instVer.DependsList();
-	D.end() == false; )
+   /* PreUnpack Checks: This loop checks and attempts to rectify and problems that would prevent the package being unpacked.
+      It addresses: PreDepends, Conflicts, Obsoletes and Breaks (DpkgBreaks). Any resolutions that do not require it should
+      avoid configuration (calling SmartUnpack with Immediate=true), this is because when unpacking some packages with
+      complex dependancy structures, trying to configure some packages while breaking the loops can complicate things .
+      This will be either dealt with if the package is configured as a dependency of Pkg (if and when Pkg is configured),
+      or by the ConfigureAll call at the end of the for loop in OrderInstall. */
+   bool Changed = false;
+   const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500);
+   unsigned int i;
+   do 
    {
-      // Compute a single dependency element (glob or)
-      pkgCache::DepIterator Start;
-      pkgCache::DepIterator End;
-      D.GlobOr(Start,End);
-      
-      while (End->Type == pkgCache::Dep::PreDepends)
+      Changed = false;
+      for (DepIterator D = instVer.DependsList(); D.end() == false; )
       {
-	 if (Debug == true)
-	    clog << "PreDepends order for " << Pkg.Name() << std::endl;
+	 // Compute a single dependency element (glob or)
+	 pkgCache::DepIterator Start, End;
+	 D.GlobOr(Start,End);
 
-	 // Look for possible ok targets.
-	 SPtrArray<Version *> VList = Start.AllTargets();
-	 bool Bad = true;
-	 for (Version **I = VList; *I != 0 && Bad == true; I++)
-	 {
-	    VerIterator Ver(Cache,*I);
-	    PkgIterator Pkg = Ver.ParentPkg();
-	    
-	    // See if the current version is ok
-	    if (Pkg.CurrentVer() == Ver && List->IsNow(Pkg) == true && 
-		Pkg.State() == PkgIterator::NeedsNothing)
+	 if (End->Type == pkgCache::Dep::PreDepends)
+         {
+	    bool Bad = true;
+	    if (Debug)
+	       clog << OutputInDepth(Depth) << "PreDepends order for " << Pkg.FullName() << std::endl;
+
+	    // Look for easy targets: packages that are already okay
+	    for (DepIterator Cur = Start; Bad == true; ++Cur)
 	    {
-	       Bad = false;
-	       if (Debug == true)
-		  clog << "Found ok package " << Pkg.Name() << endl;
-	       continue;
+	       SPtrArray<Version *> VList = Start.AllTargets();
+	       for (Version **I = VList; *I != 0; ++I)
+	       {
+		  VerIterator Ver(Cache,*I);
+		  PkgIterator Pkg = Ver.ParentPkg();
+
+		  // See if the current version is ok
+		  if (Pkg.CurrentVer() == Ver && List->IsNow(Pkg) == true &&
+		      Pkg.State() == PkgIterator::NeedsNothing)
+		  {
+		     Bad = false;
+		     if (Debug)
+			clog << OutputInDepth(Depth) << "Found ok package " << Pkg.FullName() << endl;
+		     break;
+		  }
+	       }
+	       if (Cur == End)
+		  break;
 	    }
-	 }
-	 
-	 // Look for something that could be configured.
-	 for (Version **I = VList; *I != 0 && Bad == true; I++)
-	 {
-	    VerIterator Ver(Cache,*I);
-	    PkgIterator Pkg = Ver.ParentPkg();
-	    
-	    // Not the install version 
-	    if (Cache[Pkg].InstallVer != *I || 
-		(Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing))
-	       continue;
 
-	    if (Debug == true)
-	       clog << "Trying to SmartConfigure " << Pkg.Name() << endl;
-	    Bad = !SmartConfigure(Pkg);
-	 }
+	    // Look for something that could be configured.
+	    for (DepIterator Cur = Start; Bad == true; ++Cur)
+	    {
+	       SPtrArray<Version *> VList = Start.AllTargets();
+	       for (Version **I = VList; *I != 0; ++I)
+	       {
+		  VerIterator Ver(Cache,*I);
+		  PkgIterator Pkg = Ver.ParentPkg();
+
+		  // Not the install version
+		  if (Cache[Pkg].InstallVer != *I ||
+		      (Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing))
+		     continue;
 
-	 /* If this or element did not match then continue on to the
-	    next or element until a matching element is found */
-	 if (Bad == true)
+		  if (List->IsFlag(Pkg,pkgOrderList::Configured))
+		  {
+		     Bad = false;
+		     break;
+		  }
+
+		  // check if it needs unpack or if if configure is enough
+		  if (List->IsFlag(Pkg,pkgOrderList::UnPacked) == false)
+		  {
+		     if (Debug)
+			clog << OutputInDepth(Depth) << "Trying to SmartUnpack " << Pkg.FullName() << endl;
+		     // SmartUnpack with the ImmediateFlag to ensure its really ready
+		     if (SmartUnPack(Pkg, true, Depth + 1) == true)
+		     {
+			Bad = false;
+			if (List->IsFlag(Pkg,pkgOrderList::Loop) == false)
+			   Changed = true;
+			break;
+		     }
+		  }
+		  else
+		  {
+		     if (Debug)
+			clog << OutputInDepth(Depth) << "Trying to SmartConfigure " << Pkg.FullName() << endl;
+		     if (SmartConfigure(Pkg, Depth + 1) == true)
+		     {
+			Bad = false;
+			if (List->IsFlag(Pkg,pkgOrderList::Loop) == false)
+			   Changed = true;
+			break;
+		     }
+		  }
+	       }
+	    }
+
+	    if (Bad == true)
+	    {
+	       if (Start == End)
+		  return _error->Error("Couldn't configure pre-depend %s for %s, "
+					"probably a dependency cycle.",
+					End.TargetPkg().FullName().c_str(),Pkg.FullName().c_str());
+	    }
+	    else
+	       continue;
+	 }
+	 else if (End->Type == pkgCache::Dep::Conflicts ||
+		  End->Type == pkgCache::Dep::Obsoletes)
 	 {
-	    // This triggers if someone make a pre-depends/depend loop.
-	    if (Start == End)
-	       return _error->Error("Couldn't configure pre-depend %s for %s, "
-				    "probably a dependency cycle.",
-				    End.TargetPkg().Name(),Pkg.Name());
-	    ++Start;
+	    /* Look for conflicts. Two packages that are both in the install
+	       state cannot conflict so we don't check.. */
+	    SPtrArray<Version *> VList = End.AllTargets();
+	    for (Version **I = VList; *I != 0; I++)
+	    {
+	       VerIterator Ver(Cache,*I);
+	       PkgIterator ConflictPkg = Ver.ParentPkg();
+	       VerIterator InstallVer(Cache,Cache[ConflictPkg].InstallVer);
+
+	       // See if the current version is conflicting
+	       if (ConflictPkg.CurrentVer() == Ver && List->IsNow(ConflictPkg))
+	       {
+		  clog << OutputInDepth(Depth) << Pkg.FullName() << " conflicts with " << ConflictPkg.FullName() << endl;
+		  /* If a loop is not present or has not yet been detected, attempt to unpack packages
+		     to resolve this conflict. If there is a loop present, remove packages to resolve this conflict */
+		  if (List->IsFlag(ConflictPkg,pkgOrderList::Loop) == false)
+		  {
+		     if (Cache[ConflictPkg].Keep() == 0 && Cache[ConflictPkg].InstallVer != 0)
+		     {
+			if (Debug)
+			   clog << OutputInDepth(Depth) << OutputInDepth(Depth) << "Unpacking " << ConflictPkg.FullName() << " to prevent conflict" << endl;
+			List->Flag(Pkg,pkgOrderList::Loop);
+			if (SmartUnPack(ConflictPkg,false, Depth + 1) == true)
+			   if (List->IsFlag(ConflictPkg,pkgOrderList::Loop) == false)
+			      Changed = true;
+			// Remove loop to allow it to be used later if needed
+			List->RmFlag(Pkg,pkgOrderList::Loop);
+		     }
+		     else if (EarlyRemove(ConflictPkg) == false)
+			return _error->Error("Internal Error, Could not early remove %s (1)",ConflictPkg.FullName().c_str());
+		  }
+		  else if (List->IsFlag(ConflictPkg,pkgOrderList::Removed) == false)
+		  {
+		     if (Debug)
+			clog << OutputInDepth(Depth) << "Because of conficts knot, removing " << ConflictPkg.FullName() << " to conflict violation" << endl;
+		     if (EarlyRemove(ConflictPkg) == false)
+			return _error->Error("Internal Error, Could not early remove %s (2)",ConflictPkg.FullName().c_str());
+		  }
+	       }
+	    }
 	 }
-	 else
-	    break;
-      }
-      
-      if (End->Type == pkgCache::Dep::Conflicts || 
-	  End->Type == pkgCache::Dep::Obsoletes)
-      {
-	 /* Look for conflicts. Two packages that are both in the install
-	    state cannot conflict so we don't check.. */
-	 SPtrArray<Version *> VList = End.AllTargets();
-	 for (Version **I = VList; *I != 0; I++)
+	 else if (End->Type == pkgCache::Dep::DpkgBreaks)
 	 {
-	    VerIterator Ver(Cache,*I);
-	    PkgIterator Pkg = Ver.ParentPkg();
-	    
-	    // See if the current version is conflicting
-	    if (Pkg.CurrentVer() == Ver && List->IsNow(Pkg) == true)
+	    SPtrArray<Version *> VList = End.AllTargets();
+	    for (Version **I = VList; *I != 0; ++I)
 	    {
-	       if (EarlyRemove(Pkg) == false)
-		  return _error->Error("Internal Error, Could not early remove %s",Pkg.Name());
+	       VerIterator Ver(Cache,*I);
+	       PkgIterator BrokenPkg = Ver.ParentPkg();
+	       if (BrokenPkg.CurrentVer() != Ver)
+	       {
+		  if (Debug)
+		     std::clog << OutputInDepth(Depth) << "  Ignore not-installed version " << Ver.VerStr() << " of " << Pkg.FullName() << " for " << End << std::endl;
+		  continue;
+	       }
+
+	       // Check if it needs to be unpacked
+	       if (List->IsFlag(BrokenPkg,pkgOrderList::InList) && Cache[BrokenPkg].Delete() == false &&
+		   List->IsNow(BrokenPkg))
+	       {
+		  if (List->IsFlag(BrokenPkg,pkgOrderList::Loop) && PkgLoop)
+		  {
+		     // This dependancy has already been dealt with by another SmartUnPack on Pkg
+		     break;
+		  }
+		  else
+		  {
+		     // Found a break, so see if we can unpack the package to avoid it
+		     // but do not set loop if another SmartUnPack already deals with it
+		     // Also, avoid it if the package we would unpack pre-depends on this one
+		     VerIterator InstallVer(Cache,Cache[BrokenPkg].InstallVer);
+		     bool circle = false;
+		     for (pkgCache::DepIterator D = InstallVer.DependsList(); D.end() == false; ++D)
+		     {
+			if (D->Type != pkgCache::Dep::PreDepends)
+			   continue;
+			SPtrArray<Version *> VL = D.AllTargets();
+			for (Version **I = VL; *I != 0; ++I)
+			{
+			   VerIterator V(Cache,*I);
+			   PkgIterator P = V.ParentPkg();
+			   // we are checking for installation as an easy 'protection' against or-groups and (unchosen) providers
+			   if (P->CurrentVer == 0 || P != Pkg || (P.CurrentVer() != V && Cache[P].InstallVer != V))
+			      continue;
+			   circle = true;
+			   break;
+			}
+			if (circle == true)
+			   break;
+		     }
+		     if (circle == true)
+		     {
+			if (Debug)
+			   clog << OutputInDepth(Depth) << "  Avoiding " << End << " avoided as " << BrokenPkg.FullName() << " has a pre-depends on " << Pkg.FullName() << std::endl;
+			continue;
+		     }
+		     else
+		     {
+			if (Debug)
+			{
+			   clog << OutputInDepth(Depth) << "  Unpacking " << BrokenPkg.FullName() << " to avoid " << End;
+			   if (PkgLoop == true)
+			      clog << " (Looping)";
+			   clog << std::endl;
+			}
+			if (PkgLoop == false)
+			   List->Flag(Pkg,pkgOrderList::Loop);
+			if (SmartUnPack(BrokenPkg, false, Depth + 1) == true)
+			{
+			   if (List->IsFlag(BrokenPkg,pkgOrderList::Loop) == false)
+			      Changed = true;
+			}
+			if (PkgLoop == false)
+			   List->RmFlag(Pkg,pkgOrderList::Loop);
+		     }
+		  }
+	       }
+	       // Check if a package needs to be removed
+	       else if (Cache[BrokenPkg].Delete() == true && List->IsFlag(BrokenPkg,pkgOrderList::Configured) == false)
+	       {
+		  if (Debug)
+		     clog << OutputInDepth(Depth) << "  Removing " << BrokenPkg.FullName() << " to avoid " << End << endl;
+		  SmartRemove(BrokenPkg);
+	       }
 	    }
 	 }
       }
-   }
-
+      if (i++ > max_loops)
+         return _error->Error("Internal error: APT::pkgPackageManager::MaxLoopCount reached in SmartConfigure for %s, aborting", Pkg.FullName().c_str());
+   } while (Changed == true);
+   
    // Check for reverse conflicts.
    if (CheckRConflicts(Pkg,Pkg.RevDependsList(),
 		   instVer.VerStr()) == false)
-      return false;
+		          return false;
    
    for (PrvIterator P = instVer.ProvidesList();
 	P.end() == false; ++P)
       if (Pkg->Group != P.OwnerPkg()->Group)
 	 CheckRConflicts(Pkg,P.ParentPkg().RevDependsList(),P.ProvideVersion());
 
+   if (PkgLoop)
+      return true;
+
    List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
 
-   if (Immediate == true && instVer->MultiArch == pkgCache::Version::Same)
+   if (Immediate == true && (instVer->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same)
    {
       /* Do lockstep M-A:same unpacking in two phases:
 	 First unpack all installed architectures, then the not installed.
@@ -619,7 +864,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
 	     Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer &&
 	      (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
 	    continue;
-	 if (SmartUnPack(P, false) == false)
+	 if (SmartUnPack(P, false, Depth + 1) == false)
 	    return false;
       }
       if (installed == false && Install(Pkg,FileNames[Pkg->ID]) == false)
@@ -631,19 +876,20 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate)
 	     Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer &&
 	      (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
 	    continue;
-	 if (SmartUnPack(P, false) == false)
+	 if (SmartUnPack(P, false, Depth + 1) == false)
 	    return false;
       }
    }
-   else if (Install(Pkg,FileNames[Pkg->ID]) == false)
+   // packages which are already unpacked don't need to be unpacked again
+   else if (Pkg.State() != pkgCache::PkgIterator::NeedsConfigure && Install(Pkg,FileNames[Pkg->ID]) == false)
       return false;
 
-   // Perform immedate configuration of the package.
-   if (Immediate == true &&
-       List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
-      if (SmartConfigure(Pkg) == false)
-	 return _error->Error(_("Could not perform immediate configuration on '%s'. "
-			"Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.Name(),2);
+   if (Immediate == true) {
+      // Perform immedate configuration of the package. 
+         if (SmartConfigure(Pkg, Depth + 1) == false)
+            _error->Warning(_("Could not perform immediate configuration on '%s'. "
+               "Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.FullName().c_str(),2);
+   }
    
    return true;
 }
@@ -677,18 +923,25 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
    for (pkgOrderList::iterator I = List->begin(); I != List->end(); ++I)
    {
       PkgIterator Pkg(Cache,*I);
-
+      
       if (List->IsNow(Pkg) == false)
       {
-	 if (Debug == true)
-	    clog << "Skipping already done " << Pkg.Name() << endl;
+         if (!List->IsFlag(Pkg,pkgOrderList::Configured) && !NoImmConfigure) {
+            if (SmartConfigure(Pkg, 0) == false && Debug)
+               _error->Warning("Internal Error, Could not configure %s",Pkg.FullName().c_str());
+            // FIXME: The above warning message might need changing
+         } else {
+	    if (Debug == true)
+	       clog << "Skipping already done " << Pkg.FullName() << endl;
+	 }
 	 continue;
+	 
       }
       
       if (List->IsMissing(Pkg) == true)
       {
 	 if (Debug == true)
-	    clog << "Sequence completed at " << Pkg.Name() << endl;
+	    clog << "Sequence completed at " << Pkg.FullName() << endl;
 	 if (DoneSomething == false)
 	 {
 	    _error->Error("Internal Error, ordering was unable to handle the media swap");
@@ -702,7 +955,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
 	  Pkg.State() == pkgCache::PkgIterator::NeedsNothing &&
 	  (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)
       {
-	 _error->Error("Internal Error, trying to manipulate a kept package (%s)",Pkg.Name());
+	 _error->Error("Internal Error, trying to manipulate a kept package (%s)",Pkg.FullName().c_str());
 	 return Failed;
       }
       
@@ -713,9 +966,16 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
 	    return Failed;
       }
       else
-	 if (SmartUnPack(Pkg) == false)
+	 if (SmartUnPack(Pkg,List->IsFlag(Pkg,pkgOrderList::Immediate),0) == false)
 	    return Failed;
       DoneSomething = true;
+      
+      if (ImmConfigureAll) {
+         /* ConfigureAll here to pick up and packages left unconfigured becuase they were unpacked in the 
+            "PreUnpack Checks" section */
+         if (!ConfigureAll())
+            return Failed; 
+      }
    }
 
    // Final run through the configure phase
@@ -728,10 +988,10 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
       if (List->IsFlag(*I,pkgOrderList::Configured) == false)
       {
 	 _error->Error("Internal error, packages left unconfigured. %s",
-		       PkgIterator(Cache,*I).Name());
+		       PkgIterator(Cache,*I).FullName().c_str());
 	 return Failed;
       }
-   }   
+   }
 	 
    return Completed;
 }
@@ -763,4 +1023,4 @@ pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int statusFd)
    
    return DoInstallPostFork(statusFd);
 }
-									/*}}}*/
+									/*}}}*/	      
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 053b4dc13..1a6a9f01c 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -23,14 +23,16 @@
 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 
+#include <apt-pkg/pkgcache.h>
 
 #include <string>
 #include <iostream>
-#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/depcache.h>
 #include <set>
 
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/depcache.h>
 using std::string;
+#endif
 
 class pkgAcquire;
 class pkgDepCache;
@@ -42,12 +44,15 @@ class pkgPackageManager : protected pkgCache::Namespace
    public:
    
    enum OrderResult {Completed,Failed,Incomplete};
+   static bool SigINTStop;
    
    protected:
-   string *FileNames;
+   std::string *FileNames;
    pkgDepCache &Cache;
    pkgOrderList *List;
    bool Debug;
+   bool NoImmConfigure;
+   bool ImmConfigureAll;
 
    /** \brief saves packages dpkg let disappear
 
@@ -57,7 +62,6 @@ class pkgPackageManager : protected pkgCache::Namespace
    */
    std::set<std::string> disappearedPkgs;
 
-   bool DepAdd(pkgOrderList &Order,PkgIterator P,int Depth = 0);
    void ImmediateAdd(PkgIterator P, bool UseInstallVer, unsigned const int &Depth = 0);
    virtual OrderResult OrderInstall();
    bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver);
@@ -68,15 +72,15 @@ class pkgPackageManager : protected pkgCache::Namespace
    
    // Install helpers
    bool ConfigureAll();
-   bool SmartConfigure(PkgIterator Pkg);
+   bool SmartConfigure(PkgIterator Pkg, int const Depth);
    //FIXME: merge on abi break
    bool SmartUnPack(PkgIterator Pkg);
-   bool SmartUnPack(PkgIterator Pkg, bool const Immediate);
+   bool SmartUnPack(PkgIterator Pkg, bool const Immediate, int const Depth);
    bool SmartRemove(PkgIterator Pkg);
-   bool EarlyRemove(PkgIterator Pkg);   
+   bool EarlyRemove(PkgIterator Pkg);  
    
    // The Actual installation implementation
-   virtual bool Install(PkgIterator /*Pkg*/,string /*File*/) {return false;};
+   virtual bool Install(PkgIterator /*Pkg*/,std::string /*File*/) {return false;};
    virtual bool Configure(PkgIterator /*Pkg*/) {return false;};
    virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
    virtual bool Go(int statusFd=-1) {return true;};
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 6db025bd0..997c70768 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -20,6 +20,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/policy.h>
 #include <apt-pkg/version.h>
@@ -29,13 +31,12 @@
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/macros.h>
 
-#include <apti18n.h>
-    
 #include <string>
 #include <sys/stat.h>
 #include <unistd.h>
-
 #include <ctype.h>
+
+#include <apti18n.h>
 									/*}}}*/
 
 using std::string;
@@ -84,6 +85,8 @@ pkgCache::Header::Header()
    memset(PkgHashTable,0,sizeof(PkgHashTable));
    memset(GrpHashTable,0,sizeof(GrpHashTable));
    memset(Pools,0,sizeof(Pools));
+
+   CacheFileSize = 0;
 }
 									/*}}}*/
 // Cache::Header::CheckSizes - Check if the two headers have same *sz	/*{{{*/
@@ -155,6 +158,9 @@ bool pkgCache::ReMap(bool const &Errorchecks)
        HeaderP->CheckSizes(DefHeader) == false)
       return _error->Error(_("The package cache file is an incompatible version"));
 
+   if (Map.Size() < HeaderP->CacheFileSize)
+      return _error->Error(_("The package cache file is corrupted, it is too small"));
+
    // Locate our VS..
    if (HeaderP->VerSysName == 0 ||
        (VS = pkgVersioningSystem::GetVS(StrP + HeaderP->VerSysName)) == 0)
@@ -484,7 +490,7 @@ pkgCache::PkgIterator::CurVersion() const
    if they provide no new information (e.g. there is no newer version than candidate)
    If no version and/or section can be found "none" is used. */
 std::ostream& 
-operator<<(ostream& out, pkgCache::PkgIterator Pkg) 
+operator<<(std::ostream& out, pkgCache::PkgIterator Pkg) 
 {
    if (Pkg.end() == true)
       return out << "invalid package";
@@ -613,13 +619,12 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets() const
       // Walk along the actual package providing versions
       for (VerIterator I = DPkg.VersionList(); I.end() == false; ++I)
       {
-	 if (Owner->VS->CheckDep(I.VerStr(),S->CompareOp,TargetVer()) == false)
+	 if (IsIgnorable(I.ParentPkg()) == true)
 	    continue;
 
-	 if (IsNegative() == true &&
-	     ParentPkg() == I.ParentPkg())
+	 if (Owner->VS->CheckDep(I.VerStr(),S->CompareOp,TargetVer()) == false)
 	    continue;
-	 
+
 	 Size++;
 	 if (Res != 0)
 	    *End++ = I;
@@ -628,13 +633,12 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets() const
       // Follow all provides
       for (PrvIterator I = DPkg.ProvidesList(); I.end() == false; ++I)
       {
-	 if (Owner->VS->CheckDep(I.ProvideVersion(),S->CompareOp,TargetVer()) == false)
+	 if (IsIgnorable(I) == true)
 	    continue;
-	 
-	 if (IsNegative() == true &&
-	     ParentPkg()->Group == I.OwnerPkg()->Group)
+
+	 if (Owner->VS->CheckDep(I.ProvideVersion(),S->CompareOp,TargetVer()) == false)
 	    continue;
-	 
+
 	 Size++;
 	 if (Res != 0)
 	    *End++ = I.OwnerVer();
@@ -676,10 +680,38 @@ void pkgCache::DepIterator::GlobOr(DepIterator &Start,DepIterator &End)
    }
 }
 									/*}}}*/
+// DepIterator::IsIgnorable - should this packag/providr be ignored?	/*{{{*/
+// ---------------------------------------------------------------------
+/* Deps like self-conflicts should be ignored as well as implicit conflicts
+   on virtual packages. */
+bool pkgCache::DepIterator::IsIgnorable(PkgIterator const &Pkg) const
+{
+   if (ParentPkg() == TargetPkg())
+      return IsNegative();
+
+   return false;
+}
+bool pkgCache::DepIterator::IsIgnorable(PrvIterator const &Prv) const
+{
+   if (IsNegative() == false)
+      return false;
+
+   PkgIterator const Pkg = ParentPkg();
+   /* Provides may never be applied against the same package (or group)
+      if it is a conflicts. See the comment above. */
+   if (Prv.OwnerPkg()->Group == Pkg->Group)
+      return true;
+   // Implicit group-conflicts should not be applied on providers of other groups
+   if (Pkg->Group == TargetPkg()->Group && Prv.OwnerPkg()->Group != Pkg->Group)
+      return true;
+
+   return false;
+}
+									/*}}}*/
 // ostream operator to handle string representation of a dependecy	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-std::ostream& operator<<(ostream& out, pkgCache::DepIterator D)
+std::ostream& operator<<(std::ostream& out, pkgCache::DepIterator D)
 {
    if (D.end() == true)
       return out << "invalid dependency";
@@ -749,9 +781,6 @@ bool pkgCache::VerIterator::Automatic() const
    return false;
 }
 									/*}}}*/
-// VerIterator::Pseudo - deprecated no-op method			/*{{{*/
-bool pkgCache::VerIterator::Pseudo() const { return false; }
-									/*}}}*/
 // VerIterator::NewestFile - Return the newest file version relation	/*{{{*/
 // ---------------------------------------------------------------------
 /* This looks at the version numbers associated with all of the sources
@@ -891,11 +920,22 @@ pkgCache::DescIterator pkgCache::VerIterator::TranslatedDescription() const
    {
       pkgCache::DescIterator Desc = DescriptionList();
       for (; Desc.end() == false; ++Desc)
-	 if (*l == Desc.LanguageCode() ||
-	     (*l == "en" && strcmp(Desc.LanguageCode(),"") == 0))
+	 if (*l == Desc.LanguageCode())
 	    break;
       if (Desc.end() == true)
-	 continue;
+      {
+	 if (*l == "en")
+	 {
+	    Desc = DescriptionList();
+	    for (; Desc.end() == false; ++Desc)
+	       if (strcmp(Desc.LanguageCode(), "") == 0)
+		  break;
+	    if (Desc.end() == true)
+	       continue;
+	 }
+	 else
+	    continue;
+      }
       return Desc;
    }
    for (pkgCache::DescIterator Desc = DescriptionList();
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 1b1743724..1a7013551 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -74,13 +74,14 @@
 #ifndef PKGLIB_PKGCACHE_H
 #define PKGLIB_PKGCACHE_H
 
-
 #include <string>
 #include <time.h>
 #include <apt-pkg/mmap.h>
 
+#ifndef APT_8_CLEANER_HEADERS
 using std::string;
-    
+#endif
+
 class pkgVersioningSystem;
 class pkgCache								/*{{{*/
 {
@@ -152,10 +153,10 @@ class pkgCache								/*{{{*/
    protected:
    
    // Memory mapped cache file
-   string CacheFile;
+   std::string CacheFile;
    MMap &Map;
 
-   unsigned long sHash(const string &S) const;
+   unsigned long sHash(const std::string &S) const;
    unsigned long sHash(const char *S) const;
    
    public:
@@ -180,16 +181,16 @@ class pkgCache								/*{{{*/
    inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();};
       
    // String hashing function (512 range)
-   inline unsigned long Hash(const string &S) const {return sHash(S);};
+   inline unsigned long Hash(const std::string &S) const {return sHash(S);};
    inline unsigned long Hash(const char *S) const {return sHash(S);};
 
    // Useful transformation things
    const char *Priority(unsigned char Priority);
    
    // Accessors
-   GrpIterator FindGrp(const string &Name);
-   PkgIterator FindPkg(const string &Name);
-   PkgIterator FindPkg(const string &Name, const string &Arch);
+   GrpIterator FindGrp(const std::string &Name);
+   PkgIterator FindPkg(const std::string &Name);
+   PkgIterator FindPkg(const std::string &Name, const std::string &Arch);
 
    Header &Head() {return *HeaderP;};
    inline GrpIterator GrpBegin();
@@ -200,6 +201,7 @@ class pkgCache								/*{{{*/
    inline PkgFileIterator FileEnd();
 
    inline bool MultiArchCache() const { return MultiArchEnabled; };
+   inline char const * const NativeArch() const;
 
    // Make me a function
    pkgVersioningSystem *VS;
@@ -214,8 +216,7 @@ class pkgCache								/*{{{*/
 
 private:
    bool MultiArchEnabled;
-   PkgIterator SingleArchFindPkg(const string &Name);
-   inline char const * const NativeArch() const;
+   PkgIterator SingleArchFindPkg(const std::string &Name);
 };
 									/*}}}*/
 // Header structure							/*{{{*/
@@ -314,6 +315,9 @@ struct pkgCache::Header
    map_ptrloc PkgHashTable[2*1048];
    map_ptrloc GrpHashTable[2*1048];
 
+   /** \brief Size of the complete cache file */
+   unsigned long  CacheFileSize;
+
    bool CheckSizes(Header &Against) const;
    Header();
 };
@@ -500,15 +504,20 @@ struct pkgCache::Version
    map_ptrloc VerStr;            // StringItem
    /** \brief section this version is filled in */
    map_ptrloc Section;           // StringItem
+
+   /** \brief Multi-Arch capabilities of a package version */
+   enum VerMultiArch { None = 0, /*!< is the default and doesn't trigger special behaviour */
+		       All = (1<<0), /*!< will cause that Ver.Arch() will report "all" */
+		       Foreign = (1<<1), /*!< can satisfy dependencies in another architecture */
+		       Same = (1<<2), /*!< can be co-installed with itself from other architectures */
+		       Allowed = (1<<3), /*!< other packages are allowed to depend on thispkg:any */
+		       AllForeign = All | Foreign,
+		       AllAllowed = All | Allowed };
    /** \brief stores the MultiArch capabilities of this version
 
-       None is the default and doesn't trigger special behaviour,
-       Foreign means that this version can fulfill dependencies even
-       if it is built for another architecture as the requester.
-       Same indicates that builds for different architectures can
-       be co-installed on the system */
-   /* FIXME: A bitflag would be better with the next abibreak… */
-   enum {None, All, Foreign, Same, Allowed, AllForeign, AllAllowed} MultiArch;
+       Flags used are defined in pkgCache::Version::VerMultiArch
+   */
+   unsigned char MultiArch;
 
    /** \brief references all the PackageFile's that this version came from
 
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index dc5a830bd..ec072fddd 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -10,7 +10,7 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#define APT_COMPATIBILITY 986
+#include <config.h>
 
 #include <apt-pkg/pkgcachegen.h>
 #include <apt-pkg/error.h>
@@ -23,21 +23,26 @@
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/macros.h>
-
 #include <apt-pkg/tagfile.h>
-
-#include <apti18n.h>
+#include <apt-pkg/metaindex.h>
+#include <apt-pkg/fileutl.h>
 
 #include <vector>
-
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>
+
+#include <apti18n.h>
 									/*}}}*/
-typedef vector<pkgIndexFile *>::iterator FileIterator;
+typedef std::vector<pkgIndexFile *>::iterator FileIterator;
 template <typename Iter> std::vector<Iter*> pkgCacheGenerator::Dynamic<Iter>::toReMap;
 
+bool IsDuplicateDescription(pkgCache::DescIterator Desc,
+			    MD5SumValue const &CurMd5, std::string const &CurLang);
+
+using std::string;
+
 // CacheGenerator::pkgCacheGenerator - Constructor			/*{{{*/
 // ---------------------------------------------------------------------
 /* We set the dirty flag and make sure that is written to the disk */
@@ -98,6 +103,7 @@ pkgCacheGenerator::~pkgCacheGenerator()
       return;
    
    Cache.HeaderP->Dirty = false;
+   Cache.HeaderP->CacheFileSize = Map.Size();
    Map.Sync(0,sizeof(pkgCache::Header));
 }
 									/*}}}*/
@@ -181,82 +187,154 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       if (PackageName.empty() == true)
 	 return false;
 
-      string const Arch = List.Architecture();
- 
+      Counter++;
+      if (Counter % 100 == 0 && Progress != 0)
+	 Progress->Progress(List.Offset());
+
+      string Arch = List.Architecture();
+      string const Version = List.Version();
+      if (Version.empty() == true && Arch.empty() == true)
+      {
+	 if (MergeListGroup(List, PackageName) == false)
+	    return false;
+      }
+
+      if (Arch.empty() == true)
+	 Arch = _config->Find("APT::Architecture");
+
       // Get a pointer to the package structure
       pkgCache::PkgIterator Pkg;
       Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
       if (NewPackage(Pkg, PackageName, Arch) == false)
-	 return _error->Error(_("Error occurred while processing %s (NewPackage)"),PackageName.c_str());
-      Counter++;
-      if (Counter % 100 == 0 && Progress != 0)
-	 Progress->Progress(List.Offset());
+	 // TRANSLATOR: The first placeholder is a package name,
+	 // the other two should be copied verbatim as they include debug info
+	 return _error->Error(_("Error occurred while processing %s (%s%d)"),
+			      PackageName.c_str(), "NewPackage", 1);
+
 
-      /* Get a pointer to the version structure. We know the list is sorted
-         so we use that fact in the search. Insertion of new versions is
-	 done with correct sorting */
-      string Version = List.Version();
       if (Version.empty() == true)
       {
-	 // we first process the package, then the descriptions
-	 // (this has the bonus that we get MMap error when we run out
-	 //  of MMap space)
-	 pkgCache::VerIterator Ver(Cache);
-	 Dynamic<pkgCache::VerIterator> DynVer(Ver);
-	 if (List.UsePackage(Pkg, Ver) == false)
-	    return _error->Error(_("Error occurred while processing %s (UsePackage1)"),
-				 PackageName.c_str());
-
- 	 // Find the right version to write the description
- 	 MD5SumValue CurMd5 = List.Description_md5();
- 	 Ver = Pkg.VersionList();
-
-	 for (; Ver.end() == false; ++Ver)
- 	 {
- 	    pkgCache::DescIterator Desc = Ver.DescriptionList();
-	    Dynamic<pkgCache::DescIterator> DynDesc(Desc);
- 	    map_ptrloc *LastDesc = &Ver->DescriptionList;
-	    bool duplicate=false;
-
-	    // don't add a new description if we have one for the given
-	    // md5 && language
-	    for ( ; Desc.end() == false; ++Desc)
-	       if (MD5SumValue(Desc.md5()) == CurMd5 && 
-	           Desc.LanguageCode() == List.DescriptionLanguage())
-		  duplicate=true;
-	    if(duplicate)
-	       continue;
-	    
- 	    for (Desc = Ver.DescriptionList();
-		 Desc.end() == false;
-		 LastDesc = &Desc->NextDesc, ++Desc)
-	    {
- 	       if (MD5SumValue(Desc.md5()) == CurMd5) 
-               {
- 		  // Add new description
-		  void const * const oldMap = Map.Data();
-		  map_ptrloc const descindex = NewDescription(Desc, List.DescriptionLanguage(), CurMd5, *LastDesc);
-		  if (oldMap != Map.Data())
-		     LastDesc += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;
-		  *LastDesc = descindex;
- 		  Desc->ParentPkg = Pkg.Index();
-		  
-		  if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false)
- 		     return _error->Error(_("Error occurred while processing %s (NewFileDesc1)"),PackageName.c_str());
- 		  break;
- 	       }
-	    }
- 	 }
+	 if (MergeListPackage(List, Pkg) == false)
+	    return false;
+      }
+      else
+      {
+	 if (MergeListVersion(List, Pkg, Version, OutVer) == false)
+	    return false;
+      }
 
-	 continue;
+      if (OutVer != 0)
+      {
+	 FoundFileDeps |= List.HasFileDeps();
+	 return true;
       }
+   }
 
-      pkgCache::VerIterator Ver = Pkg.VersionList();
-      Dynamic<pkgCache::VerIterator> DynVer(Ver);
-      map_ptrloc *LastVer = &Pkg->VersionList;
-      void const * oldMap = Map.Data();
+   if (Cache.HeaderP->PackageCount >= (1ULL<<sizeof(Cache.PkgP->ID)*8)-1)
+      return _error->Error(_("Wow, you exceeded the number of package "
+			     "names this APT is capable of."));
+   if (Cache.HeaderP->VersionCount >= (1ULL<<(sizeof(Cache.VerP->ID)*8))-1)
+      return _error->Error(_("Wow, you exceeded the number of versions "
+			     "this APT is capable of."));
+   if (Cache.HeaderP->DescriptionCount >= (1ULL<<(sizeof(Cache.DescP->ID)*8))-1)
+      return _error->Error(_("Wow, you exceeded the number of descriptions "
+			     "this APT is capable of."));
+   if (Cache.HeaderP->DependsCount >= (1ULL<<(sizeof(Cache.DepP->ID)*8))-1ULL)
+      return _error->Error(_("Wow, you exceeded the number of dependencies "
+			     "this APT is capable of."));
+
+   FoundFileDeps |= List.HasFileDeps();
+   return true;
+}
+// CacheGenerator::MergeListGroup					/*{{{*/
+bool pkgCacheGenerator::MergeListGroup(ListParser &List, std::string const &GrpName)
+{
+   pkgCache::GrpIterator Grp = Cache.FindGrp(GrpName);
+   // a group has no data on it's own, only packages have it but these
+   // stanzas like this come from Translation- files to add descriptions,
+   // but without a version we don't need a description for it…
+   if (Grp.end() == true)
+      return true;
+   Dynamic<pkgCache::GrpIterator> DynGrp(Grp);
+
+   pkgCache::PkgIterator Pkg;
+   Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
+   for (Pkg = Grp.PackageList(); Pkg.end() == false; Pkg = Grp.NextPkg(Pkg))
+      if (MergeListPackage(List, Pkg) == false)
+	 return false;
+
+   return true;
+}
+									/*}}}*/
+// CacheGenerator::MergeListPackage					/*{{{*/
+bool pkgCacheGenerator::MergeListPackage(ListParser &List, pkgCache::PkgIterator &Pkg)
+{
+   // we first process the package, then the descriptions
+   // (for deb this package processing is in fact a no-op)
+   pkgCache::VerIterator Ver(Cache);
+   Dynamic<pkgCache::VerIterator> DynVer(Ver);
+   if (List.UsePackage(Pkg, Ver) == false)
+      return _error->Error(_("Error occurred while processing %s (%s%d)"),
+			   Pkg.Name(), "UsePackage", 1);
+
+   // Find the right version to write the description
+   MD5SumValue CurMd5 = List.Description_md5();
+   std::string CurLang = List.DescriptionLanguage();
+
+   for (Ver = Pkg.VersionList(); Ver.end() == false; ++Ver)
+   {
+      pkgCache::DescIterator Desc = Ver.DescriptionList();
+
+      // a version can only have one md5 describing it
+      if (MD5SumValue(Desc.md5()) != CurMd5)
+	 continue;
+
+      // don't add a new description if we have one for the given
+      // md5 && language
+      if (IsDuplicateDescription(Desc, CurMd5, CurLang) == true)
+	 continue;
+
+      Dynamic<pkgCache::DescIterator> DynDesc(Desc);
+      // we add at the end, so that the start is constant as we need
+      // that to be able to efficiently share these lists
+      map_ptrloc *LastDesc = &Ver->DescriptionList;
+      for (;Desc.end() == false && Desc->NextDesc != 0; ++Desc);
+      if (Desc.end() == false)
+	 LastDesc = &Desc->NextDesc;
+
+      void const * const oldMap = Map.Data();
+      map_ptrloc const descindex = NewDescription(Desc, CurLang, CurMd5, *LastDesc);
+      if (oldMap != Map.Data())
+	 LastDesc += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;
+      *LastDesc = descindex;
+      Desc->ParentPkg = Pkg.Index();
+
+      if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false)
+	 return _error->Error(_("Error occurred while processing %s (%s%d)"),
+			      Pkg.Name(), "NewFileDesc", 1);
+
+      // we can stop here as all "same" versions will share the description
+      break;
+   }
+
+   return true;
+}
+									/*}}}*/
+// CacheGenerator::MergeListVersion					/*{{{*/
+bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg,
+					 std::string const &Version, pkgCache::VerIterator* &OutVer)
+{
+   pkgCache::VerIterator Ver = Pkg.VersionList();
+   Dynamic<pkgCache::VerIterator> DynVer(Ver);
+   map_ptrloc *LastVer = &Pkg->VersionList;
+   void const * oldMap = Map.Data();
+
+   unsigned long const Hash = List.VersionHash();
+   if (Ver.end() == false)
+   {
+      /* We know the list is sorted so we use that fact in the search.
+         Insertion of new versions is done with correct sorting */
       int Res = 1;
-      unsigned long const Hash = List.VersionHash();
       for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++)
       {
 	 Res = Cache.VS->CmpVersion(Version,Ver.VerStr());
@@ -274,94 +352,123 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       if (Res == 0 && Ver.end() == false && Ver->Hash == Hash)
       {
 	 if (List.UsePackage(Pkg,Ver) == false)
-	    return _error->Error(_("Error occurred while processing %s (UsePackage2)"),
-				 PackageName.c_str());
+	    return _error->Error(_("Error occurred while processing %s (%s%d)"),
+				 Pkg.Name(), "UsePackage", 2);
 
 	 if (NewFileVer(Ver,List) == false)
-	    return _error->Error(_("Error occurred while processing %s (NewFileVer1)"),
-				 PackageName.c_str());
-	 
+	    return _error->Error(_("Error occurred while processing %s (%s%d)"),
+				 Pkg.Name(), "NewFileVer", 1);
+
 	 // Read only a single record and return
 	 if (OutVer != 0)
 	 {
 	    *OutVer = Ver;
-	    FoundFileDeps |= List.HasFileDeps();
 	    return true;
 	 }
-	 
-	 continue;
+
+	 return true;
       }
+   }
 
-      // Add a new version
-      map_ptrloc const verindex = NewVersion(Ver,Version,*LastVer);
-      if (verindex == 0 && _error->PendingError())
-	 return _error->Error(_("Error occurred while processing %s (NewVersion%d)"),
-			      PackageName.c_str(), 1);
+   // Add a new version
+   map_ptrloc const verindex = NewVersion(Ver,Version,*LastVer);
+   if (verindex == 0 && _error->PendingError())
+      return _error->Error(_("Error occurred while processing %s (%s%d)"),
+			   Pkg.Name(), "NewVersion", 1);
 
-      if (oldMap != Map.Data())
+   if (oldMap != Map.Data())
 	 LastVer += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;
-      *LastVer = verindex;
-      Ver->ParentPkg = Pkg.Index();
-      Ver->Hash = Hash;
+   *LastVer = verindex;
+   Ver->ParentPkg = Pkg.Index();
+   Ver->Hash = Hash;
 
-      if (List.NewVersion(Ver) == false)
-	 return _error->Error(_("Error occurred while processing %s (NewVersion%d)"),
-			      PackageName.c_str(), 2);
+   if (unlikely(List.NewVersion(Ver) == false))
+      return _error->Error(_("Error occurred while processing %s (%s%d)"),
+			   Pkg.Name(), "NewVersion", 2);
 
-      if (List.UsePackage(Pkg,Ver) == false)
-	 return _error->Error(_("Error occurred while processing %s (UsePackage3)"),
-			      PackageName.c_str());
-      
-      if (NewFileVer(Ver,List) == false)
-	 return _error->Error(_("Error occurred while processing %s (NewVersion%d)"),
-			      PackageName.c_str(), 3);
+   if (unlikely(List.UsePackage(Pkg,Ver) == false))
+      return _error->Error(_("Error occurred while processing %s (%s%d)"),
+			   Pkg.Name(), "UsePackage", 3);
 
-      // Read only a single record and return
-      if (OutVer != 0)
-      {
-	 *OutVer = Ver;
-	 FoundFileDeps |= List.HasFileDeps();
-	 return true;
-      }      
+   if (unlikely(NewFileVer(Ver,List) == false))
+      return _error->Error(_("Error occurred while processing %s (%s%d)"),
+			   Pkg.Name(), "NewFileVer", 2);
 
-      /* Record the Description data. Description data always exist in
-	 Packages and Translation-* files. */
-      pkgCache::DescIterator Desc = Ver.DescriptionList();
-      Dynamic<pkgCache::DescIterator> DynDesc(Desc);
-      map_ptrloc *LastDesc = &Ver->DescriptionList;
+   pkgCache::GrpIterator Grp = Pkg.Group();
+   Dynamic<pkgCache::GrpIterator> DynGrp(Grp);
 
-      // Skip to the end of description set
-      for (; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++);
+   /* If it is the first version of this package we need to add implicit
+      Multi-Arch dependencies to all other package versions in the group now -
+      otherwise we just add them for this new version */
+   if (Pkg.VersionList()->NextVer == 0)
+   {
+      pkgCache::PkgIterator P = Grp.PackageList();
+      Dynamic<pkgCache::PkgIterator> DynP(P);
+      for (; P.end() != true; P = Grp.NextPkg(P))
+      {
+	 if (P->ID == Pkg->ID)
+	    continue;
+	 pkgCache::VerIterator V = P.VersionList();
+	 Dynamic<pkgCache::VerIterator> DynV(V);
+	 for (; V.end() != true; ++V)
+	    if (unlikely(AddImplicitDepends(V, Pkg) == false))
+	       return _error->Error(_("Error occurred while processing %s (%s%d)"),
+				    Pkg.Name(), "AddImplicitDepends", 1);
+      }
+   }
+   if (unlikely(AddImplicitDepends(Grp, Pkg, Ver) == false))
+      return _error->Error(_("Error occurred while processing %s (%s%d)"),
+			   Pkg.Name(), "AddImplicitDepends", 2);
 
-      // Add new description
-      oldMap = Map.Data();
-      map_ptrloc const descindex = NewDescription(Desc, List.DescriptionLanguage(), List.Description_md5(), *LastDesc);
-      if (oldMap != Map.Data())
-	 LastDesc += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;
-      *LastDesc = descindex;
-      Desc->ParentPkg = Pkg.Index();
+   // Read only a single record and return
+   if (OutVer != 0)
+   {
+      *OutVer = Ver;
+      return true;
+   }
 
-      if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false)
-	 return _error->Error(_("Error occurred while processing %s (NewFileDesc2)"),PackageName.c_str());
+   /* Record the Description (it is not translated) */
+   MD5SumValue CurMd5 = List.Description_md5();
+   if (CurMd5.Value().empty() == true)
+      return true;
+   std::string CurLang = List.DescriptionLanguage();
+
+   /* Before we add a new description we first search in the group for
+      a version with a description of the same MD5 - if so we reuse this
+      description group instead of creating our own for this version */
+   for (pkgCache::PkgIterator P = Grp.PackageList();
+	P.end() == false; P = Grp.NextPkg(P))
+   {
+      for (pkgCache::VerIterator V = P.VersionList();
+	   V.end() == false; ++V)
+      {
+	 if (IsDuplicateDescription(V.DescriptionList(), CurMd5, "") == false)
+	    continue;
+	 Ver->DescriptionList = V->DescriptionList;
+	 return true;
+      }
    }
 
-   FoundFileDeps |= List.HasFileDeps();
+   // We haven't found reusable descriptions, so add the first description
+   pkgCache::DescIterator Desc = Ver.DescriptionList();
+   Dynamic<pkgCache::DescIterator> DynDesc(Desc);
+   map_ptrloc *LastDesc = &Ver->DescriptionList;
+
+   oldMap = Map.Data();
+   map_ptrloc const descindex = NewDescription(Desc, CurLang, CurMd5, *LastDesc);
+   if (oldMap != Map.Data())
+       LastDesc += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;
+   *LastDesc = descindex;
+   Desc->ParentPkg = Pkg.Index();
+
+   if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false)
+      return _error->Error(_("Error occurred while processing %s (%s%d)"),
+			   Pkg.Name(), "NewFileDesc", 2);
 
-   if (Cache.HeaderP->PackageCount >= (1ULL<<sizeof(Cache.PkgP->ID)*8)-1)
-      return _error->Error(_("Wow, you exceeded the number of package "
-			     "names this APT is capable of."));
-   if (Cache.HeaderP->VersionCount >= (1ULL<<(sizeof(Cache.VerP->ID)*8))-1)
-      return _error->Error(_("Wow, you exceeded the number of versions "
-			     "this APT is capable of."));
-   if (Cache.HeaderP->DescriptionCount >= (1ULL<<(sizeof(Cache.DescP->ID)*8))-1)
-      return _error->Error(_("Wow, you exceeded the number of descriptions "
-			     "this APT is capable of."));
-   if (Cache.HeaderP->DependsCount >= (1ULL<<(sizeof(Cache.DepP->ID)*8))-1ULL)
-      return _error->Error(_("Wow, you exceeded the number of dependencies "
-			     "this APT is capable of."));
    return true;
 }
 									/*}}}*/
+									/*}}}*/
 // CacheGenerator::MergeFileProvides - Merge file provides   		/*{{{*/
 // ---------------------------------------------------------------------
 /* If we found any file depends while parsing the main list we need to 
@@ -386,8 +493,8 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List)
       pkgCache::PkgIterator Pkg = Cache.FindPkg(PackageName);
       Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
       if (Pkg.end() == true)
-	 return _error->Error(_("Error occurred while processing %s (FindPkg)"),
-				PackageName.c_str());
+	 return _error->Error(_("Error occurred while processing %s (%s%d)"),
+				PackageName.c_str(), "FindPkg", 1);
       Counter++;
       if (Counter % 100 == 0 && Progress != 0)
 	 Progress->Progress(List.Offset());
@@ -400,7 +507,8 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List)
 	 if (Ver->Hash == Hash && Version.c_str() == Ver.VerStr())
 	 {
 	    if (List.CollectFileProvides(Cache,Ver) == false)
-	       return _error->Error(_("Error occurred while processing %s (CollectFileProvides)"),PackageName.c_str());
+	       return _error->Error(_("Error occurred while processing %s (%s%d)"),
+				    PackageName.c_str(), "CollectFileProvides", 1);
 	    break;
 	 }
       }
@@ -492,6 +600,75 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name
    return true;
 }
 									/*}}}*/
+// CacheGenerator::AddImplicitDepends					/*{{{*/
+bool pkgCacheGenerator::AddImplicitDepends(pkgCache::GrpIterator &G,
+					   pkgCache::PkgIterator &P,
+					   pkgCache::VerIterator &V)
+{
+   // copy P.Arch() into a string here as a cache remap
+   // in NewDepends() later may alter the pointer location
+   string Arch = P.Arch() == NULL ? "" : P.Arch();
+   map_ptrloc *OldDepLast = NULL;
+   /* MultiArch handling introduces a lot of implicit Dependencies:
+      - MultiArch: same → Co-Installable if they have the same version
+      - All others conflict with all other group members */
+   bool const coInstall = ((V->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same);
+   pkgCache::PkgIterator D = G.PackageList();
+   Dynamic<pkgCache::PkgIterator> DynD(D);
+   for (; D.end() != true; D = G.NextPkg(D))
+   {
+      if (Arch == D.Arch() || D->VersionList == 0)
+	 continue;
+      /* We allow only one installed arch at the time
+	 per group, therefore each group member conflicts
+	 with all other group members */
+      if (coInstall == true)
+      {
+	 // Replaces: ${self}:other ( << ${binary:Version})
+	 NewDepends(D, V, V.VerStr(),
+		    pkgCache::Dep::Less, pkgCache::Dep::Replaces,
+		    OldDepLast);
+	 // Breaks: ${self}:other (!= ${binary:Version})
+	 NewDepends(D, V, V.VerStr(),
+		    pkgCache::Dep::NotEquals, pkgCache::Dep::DpkgBreaks,
+		    OldDepLast);
+      } else {
+	 // Conflicts: ${self}:other
+	 NewDepends(D, V, "",
+		    pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts,
+		    OldDepLast);
+      }
+   }
+   return true;
+}
+bool pkgCacheGenerator::AddImplicitDepends(pkgCache::VerIterator &V,
+					   pkgCache::PkgIterator &D)
+{
+   /* MultiArch handling introduces a lot of implicit Dependencies:
+      - MultiArch: same → Co-Installable if they have the same version
+      - All others conflict with all other group members */
+   map_ptrloc *OldDepLast = NULL;
+   bool const coInstall = ((V->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same);
+   if (coInstall == true)
+   {
+      // Replaces: ${self}:other ( << ${binary:Version})
+      NewDepends(D, V, V.VerStr(),
+		 pkgCache::Dep::Less, pkgCache::Dep::Replaces,
+		 OldDepLast);
+      // Breaks: ${self}:other (!= ${binary:Version})
+      NewDepends(D, V, V.VerStr(),
+		 pkgCache::Dep::NotEquals, pkgCache::Dep::DpkgBreaks,
+		 OldDepLast);
+   } else {
+      // Conflicts: ${self}:other
+      NewDepends(D, V, "",
+		 pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts,
+		 OldDepLast);
+   }
+   return true;
+}
+
+									/*}}}*/
 // CacheGenerator::NewFileVer - Create a new File<->Version association	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -610,76 +787,6 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc,
    return Description;
 }
 									/*}}}*/
-// CacheGenerator::FinishCache - do various finish operations		/*{{{*/
-// ---------------------------------------------------------------------
-/* This prepares the Cache for delivery */
-bool pkgCacheGenerator::FinishCache(OpProgress *Progress)
-{
-   // FIXME: add progress reporting for this operation
-   // Do we have different architectures in your groups ?
-   vector<string> archs = APT::Configuration::getArchitectures();
-   if (archs.size() > 1)
-   {
-      // Create Conflicts in between the group
-      pkgCache::GrpIterator G = GetCache().GrpBegin();
-      Dynamic<pkgCache::GrpIterator> DynG(G);
-      for (; G.end() != true; ++G)
-      {
-	 string const PkgName = G.Name();
-	 pkgCache::PkgIterator P = G.PackageList();
-	 Dynamic<pkgCache::PkgIterator> DynP(P);
-	 for (; P.end() != true; P = G.NextPkg(P))
-	 {
-	    pkgCache::PkgIterator allPkg;
-	    Dynamic<pkgCache::PkgIterator> DynallPkg(allPkg);
-	    pkgCache::VerIterator V = P.VersionList();
-	    Dynamic<pkgCache::VerIterator> DynV(V);
-	    for (; V.end() != true; ++V)
-	    {
-               // copy P.Arch() into a string here as a cache remap
-               // in NewDepends() later may alter the pointer location
-	       string Arch = P.Arch() == NULL ? "" : P.Arch();
-	       map_ptrloc *OldDepLast = NULL;
-	       /* MultiArch handling introduces a lot of implicit Dependencies:
-		- MultiArch: same → Co-Installable if they have the same version
-		- Architecture: all → Need to be Co-Installable for internal reasons
-		- All others conflict with all other group members */
-	       bool const coInstall = ((V->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same);
-	       for (vector<string>::const_iterator A = archs.begin(); A != archs.end(); ++A)
-	       {
-		  if (*A == Arch)
-		     continue;
-		  /* We allow only one installed arch at the time
-		     per group, therefore each group member conflicts
-		     with all other group members */
-		  pkgCache::PkgIterator D = G.FindPkg(*A);
-		  Dynamic<pkgCache::PkgIterator> DynD(D);
-		  if (D.end() == true)
-		     continue;
-		  if (coInstall == true)
-		  {
-		     // Replaces: ${self}:other ( << ${binary:Version})
-		     NewDepends(D, V, V.VerStr(),
-				pkgCache::Dep::Less, pkgCache::Dep::Replaces,
-				OldDepLast);
-		     // Breaks: ${self}:other (!= ${binary:Version})
-		     NewDepends(D, V, V.VerStr(),
-				pkgCache::Dep::NotEquals, pkgCache::Dep::DpkgBreaks,
-				OldDepLast);
-		  } else {
-			// Conflicts: ${self}:other
-			NewDepends(D, V, "",
-				   pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts,
-				   OldDepLast);
-		  }
-	       }
-	    }
-	 }
-      }
-   }
-   return true;
-}
-									/*}}}*/
 // CacheGenerator::NewDepends - Create a dependency element		/*{{{*/
 // ---------------------------------------------------------------------
 /* This creates a dependency element in the tree. It is linked to the
@@ -1116,14 +1223,14 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
 			MMap **OutMap,bool AllowMem)
 {
    bool const Debug = _config->FindB("Debug::pkgCacheGen", false);
-   
-   vector<pkgIndexFile *> Files;
-   for (vector<metaIndex *>::const_iterator i = List.begin();
+
+   std::vector<pkgIndexFile *> Files;
+   for (std::vector<metaIndex *>::const_iterator i = List.begin();
         i != List.end();
         ++i)
    {
-      vector <pkgIndexFile *> *Indexes = (*i)->GetIndexFiles();
-      for (vector<pkgIndexFile *>::const_iterator j = Indexes->begin();
+      std::vector <pkgIndexFile *> *Indexes = (*i)->GetIndexFiles();
+      for (std::vector<pkgIndexFile *>::const_iterator j = Indexes->begin();
 	   j != Indexes->end();
 	   ++j)
          Files.push_back (*j);
@@ -1242,9 +1349,6 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
       if (BuildCache(Gen,Progress,CurrentSize,TotalSize,
 		     Files.begin()+EndOfSource,Files.end()) == false)
 	 return false;
-
-      // FIXME: move me to a better place
-      Gen.FinishCache(Progress);
    }
    else
    {
@@ -1287,9 +1391,6 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
       if (BuildCache(Gen,Progress,CurrentSize,TotalSize,
 		     Files.begin()+EndOfSource,Files.end()) == false)
 	 return false;
-
-      // FIXME: move me to a better place
-      Gen.FinishCache(Progress);
    }
    if (Debug == true)
       std::clog << "Caches are ready for shipping" << std::endl;
@@ -1319,7 +1420,7 @@ __deprecated bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutM
    { return pkgCacheGenerator::MakeOnlyStatusCache(&Progress, OutMap); }
 bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap)
 {
-   vector<pkgIndexFile *> Files;
+   std::vector<pkgIndexFile *> Files;
    unsigned long EndOfSource = Files.size();
    if (_system->AddStatusFiles(Files) == false)
       return false;
@@ -1340,9 +1441,6 @@ bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **O
 		  Files.begin()+EndOfSource,Files.end()) == false)
       return false;
 
-   // FIXME: move me to a better place
-   Gen.FinishCache(Progress);
-
    if (_error->PendingError() == true)
       return false;
    *OutMap = Map.UnGuard();
@@ -1350,3 +1448,22 @@ bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **O
    return true;
 }
 									/*}}}*/
+// IsDuplicateDescription						/*{{{*/
+bool IsDuplicateDescription(pkgCache::DescIterator Desc,
+			    MD5SumValue const &CurMd5, std::string const &CurLang)
+{
+   // Descriptions in the same link-list have all the same md5
+   if (MD5SumValue(Desc.md5()) != CurMd5)
+      return false;
+   for (; Desc.end() == false; ++Desc)
+      if (Desc.LanguageCode() == CurLang)
+	 return true;
+   return false;
+}
+									/*}}}*/
+// CacheGenerator::FinishCache						/*{{{*/
+bool pkgCacheGenerator::FinishCache(OpProgress *Progress)
+{
+   return true;
+}
+									/*}}}*/
diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index c26051182..b6259b433 100644
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -22,6 +22,7 @@
 
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/md5.h>
+#include <apt-pkg/macros.h>
 
 #include <vector>
 
@@ -63,29 +64,29 @@ class pkgCacheGenerator							/*{{{*/
    pkgCache Cache;
    OpProgress *Progress;
    
-   string PkgFileName;
+   std::string PkgFileName;
    pkgCache::PackageFile *CurrentFile;
 
    // Flag file dependencies
    bool FoundFileDeps;
    
-   bool NewGroup(pkgCache::GrpIterator &Grp,const string &Name);
-   bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Name, const string &Arch);
+   bool NewGroup(pkgCache::GrpIterator &Grp,const std::string &Name);
+   bool NewPackage(pkgCache::PkgIterator &Pkg,const std::string &Name, const std::string &Arch);
    bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);
    bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List);
    bool NewDepends(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver,
-		   string const &Version, unsigned int const &Op,
+		   std::string const &Version, unsigned int const &Op,
 		   unsigned int const &Type, map_ptrloc* &OldDepLast);
-   unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next);
-   map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const string &Lang,const MD5SumValue &md5sum,map_ptrloc Next);
+   unsigned long NewVersion(pkgCache::VerIterator &Ver,const std::string &VerStr,unsigned long Next);
+   map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const std::string &Lang,const MD5SumValue &md5sum,map_ptrloc Next);
 
    public:
 
    unsigned long WriteUniqString(const char *S,unsigned int Size);
-   inline unsigned long WriteUniqString(const string &S) {return WriteUniqString(S.c_str(),S.length());};
+   inline unsigned long WriteUniqString(const std::string &S) {return WriteUniqString(S.c_str(),S.length());};
 
    void DropProgress() {Progress = 0;};
-   bool SelectFile(const string &File,const string &Site,pkgIndexFile const &Index,
+   bool SelectFile(const std::string &File,const std::string &Site,pkgIndexFile const &Index,
 		   unsigned long Flags = 0);
    bool MergeList(ListParser &List,pkgCache::VerIterator *Ver = 0);
    inline pkgCache &GetCache() {return Cache;};
@@ -94,7 +95,7 @@ class pkgCacheGenerator							/*{{{*/
 
    bool HasFileDeps() {return FoundFileDeps;};
    bool MergeFileProvides(ListParser &List);
-   bool FinishCache(OpProgress *Progress);
+   __deprecated bool FinishCache(OpProgress *Progress);
 
    static bool MakeStatusCache(pkgSourceList &List,OpProgress *Progress,
 			MMap **OutMap = 0,bool AllowMem = false);
@@ -105,6 +106,16 @@ class pkgCacheGenerator							/*{{{*/
 
    pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress);
    ~pkgCacheGenerator();
+
+   private:
+   bool MergeListGroup(ListParser &List, std::string const &GrpName);
+   bool MergeListPackage(ListParser &List, pkgCache::PkgIterator &Pkg);
+   bool MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg,
+			 std::string const &Version, pkgCache::VerIterator* &OutVer);
+
+   bool AddImplicitDepends(pkgCache::GrpIterator &G, pkgCache::PkgIterator &P,
+			   pkgCache::VerIterator &V);
+   bool AddImplicitDepends(pkgCache::VerIterator &V, pkgCache::PkgIterator &D);
 };
 									/*}}}*/
 // This is the abstract package list parser class.			/*{{{*/
@@ -122,26 +133,26 @@ class pkgCacheGenerator::ListParser
       
    protected:
 
-   inline unsigned long WriteUniqString(string S) {return Owner->WriteUniqString(S);};
+   inline unsigned long WriteUniqString(std::string S) {return Owner->WriteUniqString(S);};
    inline unsigned long WriteUniqString(const char *S,unsigned int Size) {return Owner->WriteUniqString(S,Size);};
-   inline unsigned long WriteString(const string &S) {return Owner->WriteStringInMap(S);};
+   inline unsigned long WriteString(const std::string &S) {return Owner->WriteStringInMap(S);};
    inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->WriteStringInMap(S,Size);};
-   bool NewDepends(pkgCache::VerIterator &Ver,const string &Package, const string &Arch,
-		   const string &Version,unsigned int Op,
+   bool NewDepends(pkgCache::VerIterator &Ver,const std::string &Package, const std::string &Arch,
+		   const std::string &Version,unsigned int Op,
 		   unsigned int Type);
-   bool NewProvides(pkgCache::VerIterator &Ver,const string &PkgName,
-		    const string &PkgArch, const string &Version);
+   bool NewProvides(pkgCache::VerIterator &Ver,const std::string &PkgName,
+		    const std::string &PkgArch, const std::string &Version);
    
    public:
    
    // These all operate against the current section
-   virtual string Package() = 0;
-   virtual string Architecture() = 0;
+   virtual std::string Package() = 0;
+   virtual std::string Architecture() = 0;
    virtual bool ArchitectureAll() = 0;
-   virtual string Version() = 0;
+   virtual std::string Version() = 0;
    virtual bool NewVersion(pkgCache::VerIterator &Ver) = 0;
-   virtual string Description() = 0;
-   virtual string DescriptionLanguage() = 0;
+   virtual std::string Description() = 0;
+   virtual std::string DescriptionLanguage() = 0;
    virtual MD5SumValue Description_md5() = 0;
    virtual unsigned short VersionHash() = 0;
    virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
@@ -164,18 +175,4 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
 			MMap **OutMap = 0,bool AllowMem = false);
 bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap);
 
-
-#ifdef APT_COMPATIBILITY
-#if APT_COMPATIBILITY != 986
-#warning "Using APT_COMPATIBILITY"
-#endif
-MMap *pkgMakeStatusCacheMem(pkgSourceList &List,OpProgress &Progress)
-{
-   MMap *Map = 0;
-   if (pkgCacheGenerator::MakeStatusCache(List,&Progress,&Map,true) == false)
-      return 0;
-   return Map;
-}
-#endif
-
 #endif
diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc
index 1a7585d8f..36dab3480 100644
--- a/apt-pkg/pkgrecords.cc
+++ b/apt-pkg/pkgrecords.cc
@@ -9,18 +9,20 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
-    
-#include <apti18n.h>   
+
+#include <apti18n.h>
 									/*}}}*/
 
 // Records::pkgRecords - Constructor					/*{{{*/
 // ---------------------------------------------------------------------
 /* This will create the necessary structures to access the status files */
-pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), 
+pkgRecords::pkgRecords(pkgCache &Cache) : d(NULL), Cache(Cache),
   Files(Cache.HeaderP->PackageFileCount)
 {
    for (pkgCache::PkgFileIterator I = Cache.FileBegin();
@@ -44,7 +46,7 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache),
 /* */
 pkgRecords::~pkgRecords()
 {
-   for ( vector<Parser*>::iterator it = Files.begin();
+   for ( std::vector<Parser*>::iterator it = Files.begin();
      it != Files.end();
      ++it)
    {
diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index c2c98188a..3658435e8 100644
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -19,7 +19,6 @@
 
 
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/fileutl.h>
 #include <vector>
 
 class pkgRecords							/*{{{*/
@@ -28,12 +27,13 @@ class pkgRecords							/*{{{*/
    class Parser;
    
    private:
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
    
    pkgCache &Cache;
    std::vector<Parser *>Files;
 
-   public:
-
+    public:
    // Lookup function
    Parser &Lookup(pkgCache::VerFileIterator const &Ver);
    Parser &Lookup(pkgCache::DescFileIterator const &Desc);
@@ -54,20 +54,24 @@ class pkgRecords::Parser						/*{{{*/
    friend class pkgRecords;
    
    // These refer to the archive file for the Version
-   virtual string FileName() {return string();};
-   virtual string MD5Hash() {return string();};
-   virtual string SHA1Hash() {return string();};
-   virtual string SHA256Hash() {return string();};
-   virtual string SourcePkg() {return string();};
-   virtual string SourceVer() {return string();};
+   virtual std::string FileName() {return std::string();};
+   virtual std::string MD5Hash() {return std::string();};
+   virtual std::string SHA1Hash() {return std::string();};
+   virtual std::string SHA256Hash() {return std::string();};
+   virtual std::string SHA512Hash() {return std::string();};
+   virtual std::string SourcePkg() {return std::string();};
+   virtual std::string SourceVer() {return std::string();};
 
    // These are some general stats about the package
-   virtual string Maintainer() {return string();};
-   virtual string ShortDesc() {return string();};
-   virtual string LongDesc() {return string();};
-   virtual string Name() {return string();};
-   virtual string Homepage() {return string();}
-   
+   virtual std::string Maintainer() {return std::string();};
+   virtual std::string ShortDesc() {return std::string();};
+   virtual std::string LongDesc() {return std::string();};
+   virtual std::string Name() {return std::string();};
+   virtual std::string Homepage() {return std::string();}
+
+   // An arbitrary custom field
+   virtual std::string RecordField(const char *fieldName) { return std::string();};
+
    // The record in binary form
    virtual void GetRec(const char *&Start,const char *&Stop) {Start = Stop = 0;};
    
diff --git a/apt-pkg/pkgsystem.cc b/apt-pkg/pkgsystem.cc
index 6dd2d3ee4..05ba6e0e6 100644
--- a/apt-pkg/pkgsystem.cc
+++ b/apt-pkg/pkgsystem.cc
@@ -10,6 +10,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/policy.h>
 #include <cassert>
@@ -24,11 +26,11 @@ unsigned long pkgSystem::GlobalListLen = 0;
 // System::pkgSystem - Constructor					/*{{{*/
 // ---------------------------------------------------------------------
 /* Add it to the global list.. */
-pkgSystem::pkgSystem()
+pkgSystem::pkgSystem() : Label(NULL), VS(NULL)
 {
    assert(GlobalListLen < sizeof(SysList)/sizeof(*SysList));
    SysList[GlobalListLen] = this;
-   GlobalListLen++;
+   ++GlobalListLen;
 }
 									/*}}}*/
 // System::GetSystem - Get the named system				/*{{{*/
diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h
index 246762e0b..75f7b9fcc 100644
--- a/apt-pkg/pkgsystem.h
+++ b/apt-pkg/pkgsystem.h
@@ -37,14 +37,20 @@
 #ifndef PKGLIB_PKGSYSTEM_H
 #define PKGLIB_PKGSYSTEM_H
 
+#include <apt-pkg/pkgcache.h>
 
-#include <apt-pkg/depcache.h>
 #include <vector>
-    
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/depcache.h>
+#endif
+
+class pkgDepCache;
 class pkgPackageManager;
 class pkgVersioningSystem;
 class Configuration;
 class pkgIndexFile;
+class PkgFileIterator;
 
 class pkgSystem
 {   
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index a369bea83..b47dab90c 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -23,6 +23,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/policy.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/tagfile.h>
@@ -31,10 +33,10 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/sptr.h>
 
-#include <apti18n.h>
-
 #include <iostream>
 #include <sstream>
+
+#include <apti18n.h>
 									/*}}}*/
 
 using namespace std;
@@ -321,6 +323,10 @@ signed short pkgPolicy::GetPriority(pkgCache::PkgIterator const &Pkg)
    
    return 0;
 }
+signed short pkgPolicy::GetPriority(pkgCache::PkgFileIterator const &File)
+{
+   return PFPriority[File->ID];
+}
 									/*}}}*/
 // PreferenceSection class - Overriding the default TrimRecord method	/*{{{*/
 // ---------------------------------------------------------------------
diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index a5e6c6048..5172a3c3b 100644
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -38,7 +38,9 @@
 #include <apt-pkg/versionmatch.h>
 #include <vector>
 
+#ifndef APT_8_CLEANER_HEADERS
 using std::vector;
+#endif
 
 class pkgPolicy : public pkgDepCache::Policy
 {
@@ -47,44 +49,43 @@ class pkgPolicy : public pkgDepCache::Policy
    struct Pin
    {
       pkgVersionMatch::MatchType Type;
-      string Data;
+      std::string Data;
       signed short Priority;
       Pin() : Type(pkgVersionMatch::None), Priority(0) {};
    };
 
    struct PkgPin : Pin
    {
-      string Pkg;
-      PkgPin(string const &Pkg) : Pin(), Pkg(Pkg) {};
+      std::string Pkg;
+      PkgPin(std::string const &Pkg) : Pin(), Pkg(Pkg) {};
    };
    
    Pin *Pins;
    signed short *PFPriority;
-   vector<Pin> Defaults;
-   vector<PkgPin> Unmatched;
+   std::vector<Pin> Defaults;
+   std::vector<PkgPin> Unmatched;
    pkgCache *Cache;
    bool StatusOverride;
    
    public:
 
    // Things for manipulating pins
-   void CreatePin(pkgVersionMatch::MatchType Type,string Pkg,
-		  string Data,signed short Priority);
-   inline signed short GetPriority(pkgCache::PkgFileIterator const &File) 
-       {return PFPriority[File->ID];};
-   signed short GetPriority(pkgCache::PkgIterator const &Pkg);
+   void CreatePin(pkgVersionMatch::MatchType Type,std::string Pkg,
+		  std::string Data,signed short Priority);
    pkgCache::VerIterator GetMatch(pkgCache::PkgIterator const &Pkg);
 
    // Things for the cache interface.
    virtual pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator const &Pkg);
-   virtual bool IsImportantDep(pkgCache::DepIterator const &Dep) {return pkgDepCache::Policy::IsImportantDep(Dep);};
+   virtual signed short GetPriority(pkgCache::PkgIterator const &Pkg);
+   virtual signed short GetPriority(pkgCache::PkgFileIterator const &File);
+
    bool InitDefaults();
    
    pkgPolicy(pkgCache *Owner);
    virtual ~pkgPolicy() {delete [] PFPriority; delete [] Pins;};
 };
 
-bool ReadPinFile(pkgPolicy &Plcy,string File = "");
-bool ReadPinDir(pkgPolicy &Plcy,string Dir = "");
+bool ReadPinFile(pkgPolicy &Plcy, std::string File = "");
+bool ReadPinDir(pkgPolicy &Plcy, std::string Dir = "");
 
 #endif
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index ebfb5289e..0fddfb451 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -8,15 +8,19 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
-
-#include <apti18n.h>
+#include <apt-pkg/metaindex.h>
+#include <apt-pkg/indexfile.h>
 
 #include <fstream>
+
+#include <apti18n.h>
 									/*}}}*/
 
 using namespace std;
@@ -29,7 +33,7 @@ unsigned long pkgSourceList::Type::GlobalListLen = 0;
 // Type::Type - Constructor						/*{{{*/
 // ---------------------------------------------------------------------
 /* Link this to the global list of items*/
-pkgSourceList::Type::Type()
+pkgSourceList::Type::Type() : Name(NULL), Label(NULL)
 {
    ItmList[GlobalListLen] = this;
    GlobalListLen++;
@@ -346,10 +350,14 @@ bool pkgSourceList::ReadSourceDir(string Dir)
 /* */
 time_t pkgSourceList::GetLastModifiedTime()
 {
-   // go over the parts
+   vector<string> List;
+
    string Main = _config->FindFile("Dir::Etc::sourcelist");
    string Parts = _config->FindDir("Dir::Etc::sourceparts");
-   vector<string> const List = GetListOfFilesInDir(Parts, "list", true);
+
+   // go over the parts
+   if (DirectoryExists(Parts) == true)
+      List = GetListOfFilesInDir(Parts, "list", true);
 
    // calculate the time
    time_t mtime_sources = GetModificationTime(Main);
diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 7b473ee64..02e27101a 100644
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -31,13 +31,17 @@
 #include <vector>
 #include <map>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/metaindex.h>
 
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/metaindex.h>
 using std::string;
 using std::vector;
-    
+#endif
+
+class pkgAcquire;
+class pkgIndexFile;
+class metaIndex;
 
-class pkgAquire;
 class pkgSourceList
 {
    public:
@@ -55,32 +59,32 @@ class pkgSourceList
       const char *Name;
       const char *Label;
 
-      bool FixupURI(string &URI) const;
-      virtual bool ParseLine(vector<metaIndex *> &List,
+      bool FixupURI(std::string &URI) const;
+      virtual bool ParseLine(std::vector<metaIndex *> &List,
 			     const char *Buffer,
-			     unsigned long const &CurLine,string const &File) const;
-      virtual bool CreateItem(vector<metaIndex *> &List,string const &URI,
-			      string const &Dist,string const &Section,
-			      std::map<string, string> const &Options) const = 0;
+			     unsigned long const &CurLine,std::string const &File) const;
+      virtual bool CreateItem(std::vector<metaIndex *> &List,std::string const &URI,
+			      std::string const &Dist,std::string const &Section,
+			      std::map<std::string, std::string> const &Options) const = 0;
       Type();
       virtual ~Type() {};
    };
    
-   typedef vector<metaIndex *>::const_iterator const_iterator;
+   typedef std::vector<metaIndex *>::const_iterator const_iterator;
    
    protected:
 
-   vector<metaIndex *> SrcList;
+   std::vector<metaIndex *> SrcList;
    
    public:
 
    bool ReadMainList();
-   bool Read(string File);
+   bool Read(std::string File);
 
    // CNC:2003-03-03
    void Reset();
-   bool ReadAppend(string File);
-   bool ReadSourceDir(string Dir);
+   bool ReadAppend(std::string File);
+   bool ReadSourceDir(std::string Dir);
    
    // List accessors
    inline const_iterator begin() const {return SrcList.begin();};
@@ -96,7 +100,7 @@ class pkgSourceList
    time_t GetLastModifiedTime();
 
    pkgSourceList();
-   pkgSourceList(string File);
+   pkgSourceList(std::string File);
    ~pkgSourceList();      
 };
 
diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc
index 946ac1a1a..d63d2c422 100644
--- a/apt-pkg/srcrecords.cc
+++ b/apt-pkg/srcrecords.cc
@@ -11,23 +11,26 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/strutl.h>
-    
-#include <apti18n.h>    
+#include <apt-pkg/metaindex.h>
+
+#include <apti18n.h>
 									/*}}}*/
 
 // SrcRecords::pkgSrcRecords - Constructor				/*{{{*/
 // ---------------------------------------------------------------------
 /* Open all the source index files */
-pkgSrcRecords::pkgSrcRecords(pkgSourceList &List) : Files(0), Current(0)
+pkgSrcRecords::pkgSrcRecords(pkgSourceList &List) : d(NULL), Files(0), Current(0)
 {
    for (pkgSourceList::const_iterator I = List.begin(); I != List.end(); ++I)
    {
-      vector<pkgIndexFile *> *Indexes = (*I)->GetIndexFiles();
-      for (vector<pkgIndexFile *>::const_iterator J = Indexes->begin();
+      std::vector<pkgIndexFile *> *Indexes = (*I)->GetIndexFiles();
+      for (std::vector<pkgIndexFile *>::const_iterator J = Indexes->begin();
 	   J != Indexes->end(); ++J)
       {
          Parser* P = (*J)->CreateSrcParser();
@@ -55,7 +58,7 @@ pkgSrcRecords::pkgSrcRecords(pkgSourceList &List) : Files(0), Current(0)
 pkgSrcRecords::~pkgSrcRecords()
 {
    // Blow away all the parser objects
-   for(vector<Parser*>::iterator I = Files.begin(); I != Files.end(); ++I)
+   for(std::vector<Parser*>::iterator I = Files.begin(); I != Files.end(); ++I)
       delete *I;
 }
 									/*}}}*/
@@ -65,7 +68,7 @@ pkgSrcRecords::~pkgSrcRecords()
 bool pkgSrcRecords::Restart()
 {
    Current = Files.begin();
-   for (vector<Parser*>::iterator I = Files.begin();
+   for (std::vector<Parser*>::iterator I = Files.begin();
         I != Files.end(); ++I)
       (*I)->Restart();
    
diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h
index a49533864..06f0dce6c 100644
--- a/apt-pkg/srcrecords.h
+++ b/apt-pkg/srcrecords.h
@@ -15,10 +15,12 @@
 
 
 #include <string>
-#include <vector>    
+#include <vector>
 
+#ifndef APT_8_CLEANER_HEADERS
 using std::string;
 using std::vector;
+#endif
 
 class pkgSourceList;
 class pkgIndexFile;
@@ -29,10 +31,10 @@ class pkgSrcRecords
    // Describes a single file
    struct File
    {
-      string MD5Hash;
+      std::string MD5Hash;
       unsigned long Size;
-      string Path;
-      string Type;
+      std::string Path;
+      std::string Type;
    };
    
    // Abstract parser for each source record
@@ -49,8 +51,8 @@ class pkgSrcRecords
 
       struct BuildDepRec 
       {
-         string Package;
-	 string Version;
+	 std::string Package;
+	 std::string Version;
 	 unsigned int Op;
 	 unsigned char Type;
       };
@@ -61,28 +63,30 @@ class pkgSrcRecords
       virtual bool Step() = 0;
       virtual bool Jump(unsigned long const &Off) = 0;
       virtual unsigned long Offset() = 0;
-      virtual string AsStr() = 0;
+      virtual std::string AsStr() = 0;
       
-      virtual string Package() const = 0;
-      virtual string Version() const = 0;
-      virtual string Maintainer() const = 0;
-      virtual string Section() const = 0;
+      virtual std::string Package() const = 0;
+      virtual std::string Version() const = 0;
+      virtual std::string Maintainer() const = 0;
+      virtual std::string Section() const = 0;
       virtual const char **Binaries() = 0;   // Ownership does not transfer
 
-      virtual bool BuildDepends(vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true) = 0;
+      virtual bool BuildDepends(std::vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true) = 0;
       static const char *BuildDepType(unsigned char const &Type);
 
-      virtual bool Files(vector<pkgSrcRecords::File> &F) = 0;
+      virtual bool Files(std::vector<pkgSrcRecords::File> &F) = 0;
       
       Parser(const pkgIndexFile *Index) : iIndex(Index) {};
       virtual ~Parser() {};
    };
    
    private:
+   /** \brief dpointer placeholder (for later in case we need it) */
+   void *d;
    
    // The list of files and the current parser pointer
-   vector<Parser*> Files;
-   vector<Parser *>::iterator Current;
+   std::vector<Parser*> Files;
+   std::vector<Parser *>::iterator Current;
    
    public:
 
@@ -93,7 +97,7 @@ class pkgSrcRecords
    Parser *Find(const char *Package,bool const &SrcOnly = false);
    
    pkgSrcRecords(pkgSourceList &List);
-   ~pkgSrcRecords();
+   virtual ~pkgSrcRecords();
 };
 
 #endif
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 4a2f3f7e6..79811899a 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -11,39 +11,59 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
 
-#include <apti18n.h>
-    
 #include <string>
 #include <stdio.h>
 #include <ctype.h>
+
+#include <apti18n.h>
 									/*}}}*/
 
 using std::string;
 
+class pkgTagFilePrivate
+{
+public:
+   pkgTagFilePrivate(FileFd *pFd, unsigned long long Size) : Fd(*pFd), Buffer(NULL),
+							     Start(NULL), End(NULL),
+							     Done(false), iOffset(0),
+							     Size(Size)
+   {
+   }
+   FileFd &Fd;
+   char *Buffer;
+   char *Start;
+   char *End;
+   bool Done;
+   unsigned long long iOffset;
+   unsigned long long Size;
+};
+
 // TagFile::pkgTagFile - Constructor					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long Size) :
-     Fd(*pFd),
-     Size(Size)
+pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long long Size)
 {
-   if (Fd.IsOpen() == false)
+   d = new pkgTagFilePrivate(pFd, Size);
+
+   if (d->Fd.IsOpen() == false)
    {
-      Buffer = 0;
-      Start = End = Buffer = 0;
-      Done = true;
-      iOffset = 0;
+      d->Start = d->End = d->Buffer = 0;
+      d->Done = true;
+      d->iOffset = 0;
       return;
    }
    
-   Buffer = new char[Size];
-   Start = End = Buffer;
-   Done = false;
-   iOffset = 0;
+   d->Buffer = new char[Size];
+   d->Start = d->End = d->Buffer;
+   d->Done = false;
+   d->iOffset = 0;
    Fill();
 }
 									/*}}}*/
@@ -52,7 +72,14 @@ pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long Size) :
 /* */
 pkgTagFile::~pkgTagFile()
 {
-   delete [] Buffer;
+   delete [] d->Buffer;
+   delete d;
+}
+									/*}}}*/
+// TagFile::Offset - Return the current offset in the buffer     	/*{{{*/
+unsigned long pkgTagFile::Offset()
+{
+   return d->iOffset;
 }
 									/*}}}*/
 // TagFile::Resize - Resize the internal buffer				/*{{{*/
@@ -63,22 +90,22 @@ pkgTagFile::~pkgTagFile()
 bool pkgTagFile::Resize()
 {
    char *tmp;
-   unsigned long EndSize = End - Start;
+   unsigned long long EndSize = d->End - d->Start;
 
    // fail is the buffer grows too big
-   if(Size > 1024*1024+1)
+   if(d->Size > 1024*1024+1)
       return false;
 
    // get new buffer and use it
-   tmp = new char[2*Size];
-   memcpy(tmp, Buffer, Size);
-   Size = Size*2;
-   delete [] Buffer;
-   Buffer = tmp;
+   tmp = new char[2*d->Size];
+   memcpy(tmp, d->Buffer, d->Size);
+   d->Size = d->Size*2;
+   delete [] d->Buffer;
+   d->Buffer = tmp;
 
    // update the start/end pointers to the new buffer
-   Start = Buffer;
-   End = Start + EndSize;
+   d->Start = d->Buffer;
+   d->End = d->Start + EndSize;
    return true;
 }
 									/*}}}*/
@@ -90,20 +117,20 @@ bool pkgTagFile::Resize()
  */
 bool pkgTagFile::Step(pkgTagSection &Tag)
 {
-   while (Tag.Scan(Start,End - Start) == false)
+   while (Tag.Scan(d->Start,d->End - d->Start) == false)
    {
       if (Fill() == false)
 	 return false;
       
-      if(Tag.Scan(Start,End - Start))
+      if(Tag.Scan(d->Start,d->End - d->Start))
 	 break;
 
       if (Resize() == false)
 	 return _error->Error(_("Unable to parse package file %s (1)"),
-				 Fd.Name().c_str());
+                              d->Fd.Name().c_str());
    }
-   Start += Tag.size();
-   iOffset += Tag.size();
+   d->Start += Tag.size();
+   d->iOffset += Tag.size();
 
    Tag.Trim();
    return true;
@@ -115,37 +142,37 @@ bool pkgTagFile::Step(pkgTagSection &Tag)
    then fills the rest from the file */
 bool pkgTagFile::Fill()
 {
-   unsigned long EndSize = End - Start;
-   unsigned long Actual = 0;
+   unsigned long long EndSize = d->End - d->Start;
+   unsigned long long Actual = 0;
    
-   memmove(Buffer,Start,EndSize);
-   Start = Buffer;
-   End = Buffer + EndSize;
+   memmove(d->Buffer,d->Start,EndSize);
+   d->Start = d->Buffer;
+   d->End = d->Buffer + EndSize;
    
-   if (Done == false)
+   if (d->Done == false)
    {
       // See if only a bit of the file is left
-      if (Fd.Read(End,Size - (End - Buffer),&Actual) == false)
+      if (d->Fd.Read(d->End, d->Size - (d->End - d->Buffer),&Actual) == false)
 	 return false;
-      if (Actual != Size - (End - Buffer))
-	 Done = true;
-      End += Actual;
+      if (Actual != d->Size - (d->End - d->Buffer))
+	 d->Done = true;
+      d->End += Actual;
    }
    
-   if (Done == true)
+   if (d->Done == true)
    {
       if (EndSize <= 3 && Actual == 0)
 	 return false;
-      if (Size - (End - Buffer) < 4)
+      if (d->Size - (d->End - d->Buffer) < 4)
 	 return true;
       
       // Append a double new line if one does not exist
       unsigned int LineCount = 0;
-      for (const char *E = End - 1; E - End < 6 && (*E == '\n' || *E == '\r'); E--)
+      for (const char *E = d->End - 1; E - d->End < 6 && (*E == '\n' || *E == '\r'); E--)
 	 if (*E == '\n')
 	    LineCount++;
       for (; LineCount < 2; LineCount++)
-	 *End++ = '\n';
+	 *d->End++ = '\n';
       
       return true;
    }
@@ -157,36 +184,36 @@ bool pkgTagFile::Fill()
 // ---------------------------------------------------------------------
 /* This jumps to a pre-recorded file location and reads the record
    that is there */
-bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset)
+bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long long Offset)
 {
    // We are within a buffer space of the next hit..
-   if (Offset >= iOffset && iOffset + (End - Start) > Offset)
+   if (Offset >= d->iOffset && d->iOffset + (d->End - d->Start) > Offset)
    {
-      unsigned long Dist = Offset - iOffset;
-      Start += Dist;
-      iOffset += Dist;
+      unsigned long long Dist = Offset - d->iOffset;
+      d->Start += Dist;
+      d->iOffset += Dist;
       return Step(Tag);
    }
 
    // Reposition and reload..
-   iOffset = Offset;
-   Done = false;
-   if (Fd.Seek(Offset) == false)
+   d->iOffset = Offset;
+   d->Done = false;
+   if (d->Fd.Seek(Offset) == false)
       return false;
-   End = Start = Buffer;
+   d->End = d->Start = d->Buffer;
    
    if (Fill() == false)
       return false;
 
-   if (Tag.Scan(Start,End - Start) == true)
+   if (Tag.Scan(d->Start, d->End - d->Start) == true)
       return true;
    
    // This appends a double new line (for the real eof handling)
    if (Fill() == false)
       return false;
    
-   if (Tag.Scan(Start,End - Start) == false)
-      return _error->Error(_("Unable to parse package file %s (2)"),Fd.Name().c_str());
+   if (Tag.Scan(d->Start, d->End - d->Start) == false)
+      return _error->Error(_("Unable to parse package file %s (2)"),d->Fd.Name().c_str());
    
    return true;
 }
@@ -457,6 +484,7 @@ static const char *iTFRewritePackageOrder[] = {
                           "MD5Sum",
                           "SHA1",
                           "SHA256",
+                          "SHA512",
                            "MSDOS-Filename",   // Obsolete
                           "Description",
                           0};
diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index a101d7b1e..fd24471c1 100644
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -20,19 +20,25 @@
 #ifndef PKGLIB_TAGFILE_H
 #define PKGLIB_TAGFILE_H
 
+#include <stdio.h>
+
+#include <string>
 
+#ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/fileutl.h>
-#include <stdio.h>
-    
+#endif
+
+class FileFd;
+
 class pkgTagSection
 {
    const char *Section;
-   
    // We have a limit of 256 tags per section.
    unsigned int Indexes[256];
    unsigned int AlphaIndexes[0x100];
-   
    unsigned int TagCount;
+   // dpointer placeholder (for later in case we need it)
+   void *d;
 
    /* This very simple hash function for the last 8 letters gives
       very good performance on the debian package files */
@@ -44,7 +50,6 @@ class pkgTagSection
       return Res & 0xFF;
    }
 
-
    protected:
    const char *Stop;
 
@@ -55,7 +60,7 @@ class pkgTagSection
    
    bool Find(const char *Tag,const char *&Start, const char *&End) const;
    bool Find(const char *Tag,unsigned &Pos) const;
-   string FindS(const char *Tag) const;
+   std::string FindS(const char *Tag) const;
    signed int FindI(const char *Tag,signed long Default = 0) const ;
    unsigned long long FindULL(const char *Tag, unsigned long long const &Default = 0) const;
    bool FindFlag(const char *Tag,unsigned long &Flags,
@@ -80,17 +85,13 @@ class pkgTagSection
    };
    
    pkgTagSection() : Section(0), TagCount(0), Stop(0) {};
+   virtual ~pkgTagSection() {};
 };
 
+class pkgTagFilePrivate;
 class pkgTagFile
 {
-   FileFd &Fd;
-   char *Buffer;
-   char *Start;
-   char *End;
-   bool Done;
-   unsigned long iOffset;
-   unsigned long Size;
+   pkgTagFilePrivate *d;
 
    bool Fill();
    bool Resize();
@@ -98,11 +99,11 @@ class pkgTagFile
    public:
 
    bool Step(pkgTagSection &Section);
-   inline unsigned long Offset() {return iOffset;};
-   bool Jump(pkgTagSection &Tag,unsigned long Offset);
+   unsigned long Offset();
+   bool Jump(pkgTagSection &Tag,unsigned long long Offset);
 
-   pkgTagFile(FileFd *F,unsigned long Size = 32*1024);
-   ~pkgTagFile();
+   pkgTagFile(FileFd *F,unsigned long long Size = 32*1024);
+   virtual ~pkgTagFile();
 };
 
 /* This is the list of things to rewrite. The rewriter
diff --git a/apt-pkg/vendor.cc b/apt-pkg/vendor.cc
index 2350afe69..36fc25957 100644
--- a/apt-pkg/vendor.cc
+++ b/apt-pkg/vendor.cc
@@ -1,3 +1,5 @@
+#include<config.h>
+
 #include <iostream>
 #include <apt-pkg/error.h>
 #include <apt-pkg/vendor.h>
@@ -20,16 +22,16 @@ Vendor::Vendor(std::string VendorID,
    delete FingerprintList;
 }
 
-const string Vendor::LookupFingerprint(string Print) const
+const std::string Vendor::LookupFingerprint(std::string Print) const
 {
-   std::map<string,string>::const_iterator Elt = Fingerprints.find(Print);
+   std::map<std::string,std::string>::const_iterator Elt = Fingerprints.find(Print);
    if (Elt == Fingerprints.end())
       return "";
    else
       return (*Elt).second;
 }
 
-bool Vendor::CheckDist(string Dist)
+bool Vendor::CheckDist(std::string Dist)
 {
    return true;
 }
diff --git a/apt-pkg/vendor.h b/apt-pkg/vendor.h
index df229737a..6484adf9b 100644
--- a/apt-pkg/vendor.h
+++ b/apt-pkg/vendor.h
@@ -6,29 +6,31 @@
 
 #include <apt-pkg/macros.h>
 
+#ifndef APT_8_CLEANER_HEADERS
 using std::string;
+#endif
 
-// A class representing a particular software provider. 
+// A class representing a particular software provider.
 class __deprecated Vendor
 {
    public:
    struct Fingerprint
    {
-      string Print;
-      string Description;
+      std::string Print;
+      std::string Description;
    };
 
    protected:
-   string VendorID;
-   string Origin;
-   std::map<string, string> Fingerprints;
+   std::string VendorID;
+   std::string Origin;
+   std::map<std::string, std::string> Fingerprints;
 
    public:
-   Vendor(string VendorID, string Origin,
+   Vendor(std::string VendorID, std::string Origin,
           std::vector<struct Fingerprint *> *FingerprintList);
-   virtual const string& GetVendorID() const { return VendorID; };
-   virtual const string LookupFingerprint(string Print) const;
-   virtual bool CheckDist(string Dist);
+   virtual const std::string& GetVendorID() const { return VendorID; };
+   virtual const std::string LookupFingerprint(std::string Print) const;
+   virtual bool CheckDist(std::string Dist);
    virtual ~Vendor(){};
 };
 
diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc
index 4cc500727..ecfc7db87 100644
--- a/apt-pkg/vendorlist.cc
+++ b/apt-pkg/vendorlist.cc
@@ -1,13 +1,20 @@
+#include<config.h>
+
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/configuration.h>
 #include <apti18n.h>
 
 #if __GNUC__ >= 4
 	#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
+#include <apt-pkg/vendor.h>
 #include <apt-pkg/vendorlist.h>
 
+using std::string;
+using std::vector;
+
 pkgVendorList::~pkgVendorList()
 {
    for (vector<const Vendor *>::const_iterator I = VendorList.begin(); 
diff --git a/apt-pkg/vendorlist.h b/apt-pkg/vendorlist.h
index eaeecb173..a86ccde7c 100644
--- a/apt-pkg/vendorlist.h
+++ b/apt-pkg/vendorlist.h
@@ -15,26 +15,30 @@
 
 #include <string>
 #include <vector>
-#include <apt-pkg/vendor.h>
-#include <apt-pkg/configuration.h>
 #include <apt-pkg/macros.h>
 
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/vendor.h>
+#include <apt-pkg/configuration.h>
 using std::string;
 using std::vector;
+#endif
 
+class Vendor;
+class Configuration;
 
 class __deprecated pkgVendorList
 {
    protected:
-   vector<Vendor const *> VendorList;
+   std::vector<Vendor const *> VendorList;
 
    bool CreateList(Configuration& Cnf);
-   const Vendor* LookupFingerprint(string Fingerprint);
+   const Vendor* LookupFingerprint(std::string Fingerprint);
 
    public:
-   typedef vector<Vendor const *>::const_iterator const_iterator;
+   typedef std::vector<Vendor const *>::const_iterator const_iterator;
    bool ReadMainList();
-   bool Read(string File);
+   bool Read(std::string File);
 
    // List accessors
    inline const_iterator begin() const {return VendorList.begin();};
@@ -42,7 +46,7 @@ class __deprecated pkgVendorList
    inline unsigned int size() const {return VendorList.size();};
    inline bool empty() const {return VendorList.empty();};
 
-   const Vendor* FindVendor(const vector<string> GPGVOutput);
+   const Vendor* FindVendor(const std::vector<std::string> GPGVOutput);
 
    ~pkgVendorList();
 };
diff --git a/apt-pkg/version.cc b/apt-pkg/version.cc
index 42e449d36..cb2c34c0f 100644
--- a/apt-pkg/version.cc
+++ b/apt-pkg/version.cc
@@ -8,6 +8,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/version.h>
 #include <apt-pkg/pkgcache.h>
 
@@ -21,10 +23,10 @@ unsigned long pkgVersioningSystem::GlobalListLen = 0;
 // pkgVS::pkgVersioningSystem - Constructor				/*{{{*/
 // ---------------------------------------------------------------------
 /* Link to the global list of versioning systems supported */
-pkgVersioningSystem::pkgVersioningSystem()
+pkgVersioningSystem::pkgVersioningSystem() : Label(NULL)
 {
    VSList[GlobalListLen] = this;
-   GlobalListLen++;
+   ++GlobalListLen;
 }
 									/*}}}*/
 // pkgVS::GetVS - Find a VS by name					/*{{{*/
diff --git a/apt-pkg/version.h b/apt-pkg/version.h
index 49c53a93a..e0e0e6c14 100644
--- a/apt-pkg/version.h
+++ b/apt-pkg/version.h
@@ -20,11 +20,12 @@
 #ifndef PKGLIB_VERSION_H
 #define PKGLIB_VERSION_H
 
-
-#include <apt-pkg/strutl.h>    
+#include <apt-pkg/strutl.h>
 #include <string>
 
+#ifndef APT_8_CLEANER_HEADERS
 using std::string;
+#endif
 
 class pkgVersioningSystem
 {
@@ -43,7 +44,7 @@ class pkgVersioningSystem
    virtual bool CheckDep(const char *PkgVer,int Op,const char *DepVer) = 0;
    virtual int DoCmpReleaseVer(const char *A,const char *Aend,
 			       const char *B,const char *Bend) = 0;
-   virtual string UpstreamVersion(const char *A) = 0;
+   virtual std::string UpstreamVersion(const char *A) = 0;
    
    // See if the given VS is compatible with this one.. 
    virtual bool TestCompatibility(pkgVersioningSystem const &Against) 
@@ -57,8 +58,4 @@ class pkgVersioningSystem
    virtual ~pkgVersioningSystem() {};
 };
 
-#ifdef APT_COMPATIBILITY
-#include <apt-pkg/debversion.h>
-#endif
-
 #endif
diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc
index 6d667acad..e4fa0ea65 100644
--- a/apt-pkg/versionmatch.cc
+++ b/apt-pkg/versionmatch.cc
@@ -11,8 +11,9 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <apt-pkg/versionmatch.h>
+#include<config.h>
 
+#include <apt-pkg/versionmatch.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 
@@ -21,9 +22,10 @@
 #include <fnmatch.h>
 #include <sys/types.h>
 #include <regex.h>
-
 									/*}}}*/
 
+using std::string;
+
 // VersionMatch::pkgVersionMatch - Constructor				/*{{{*/
 // ---------------------------------------------------------------------
 /* Break up the data string according to the selected type */
diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h
index 39639a23d..433396fc9 100644
--- a/apt-pkg/versionmatch.h
+++ b/apt-pkg/versionmatch.h
@@ -39,40 +39,42 @@
 #include <string>
 #include <apt-pkg/pkgcache.h>
 
+#ifndef APT_8_CLEANER_HEADERS
 using std::string;
+#endif
 
 class pkgVersionMatch
 {   
    // Version Matching
-   string VerStr;
+   std::string VerStr;
    bool VerPrefixMatch;
 
    // Release Matching
-   string RelVerStr;
+   std::string RelVerStr;
    bool RelVerPrefixMatch;
-   string RelOrigin;
-   string RelRelease;
-   string RelCodename;
-   string RelArchive;
-   string RelLabel;
-   string RelComponent;
-   string RelArchitecture;
+   std::string RelOrigin;
+   std::string RelRelease;
+   std::string RelCodename;
+   std::string RelArchive;
+   std::string RelLabel;
+   std::string RelComponent;
+   std::string RelArchitecture;
    bool MatchAll;
    
    // Origin Matching
-   string OrSite;
+   std::string OrSite;
    
    public:
    
    enum MatchType {None = 0,Version,Release,Origin} Type;
    
-   bool MatchVer(const char *A,string B,bool Prefix);
+   bool MatchVer(const char *A,std::string B,bool Prefix);
    bool ExpressionMatches(const char *pattern, const char *string);
    bool ExpressionMatches(const std::string& pattern, const char *string);
    bool FileMatch(pkgCache::PkgFileIterator File);
    pkgCache::VerIterator Find(pkgCache::PkgIterator Pkg);
 			       
-   pkgVersionMatch(string Data,MatchType Type);
+   pkgVersionMatch(std::string Data,MatchType Type);
 };
 
 #endif
diff --git a/buildlib/config.h.in b/buildlib/config.h.in
index b3609a700..b07d4f77f 100644
--- a/buildlib/config.h.in
+++ b/buildlib/config.h.in
@@ -19,6 +19,12 @@
 /* Define if we have the timegm() function */
 #undef HAVE_TIMEGM
 
+/* Define if we have the zlib library for gzip */
+#undef HAVE_ZLIB
+
+/* Define if we have the bz2 library for bzip2 */
+#undef HAVE_BZ2
+
 /* These two are used by the statvfs shim for glibc2.0 and bsd */
 /* Define if we have sys/vfs.h */
 #undef HAVE_VFS_H
@@ -33,11 +39,16 @@
 /* If there is no socklen_t, define this for the netdb shim */
 #undef NEED_SOCKLEN_T_DEFINE
 
+/* Define to the size of the filesize containing structures */
+#undef _FILE_OFFSET_BITS
+
 /* Define the arch name string */
 #undef COMMON_ARCH
 
-/* The version number string */
-#undef VERSION
-
 /* The package name string */
 #undef PACKAGE
+
+/* The version number string */
+#undef PACKAGE_VERSION
+
+#define APT_8_CLEANER_HEADERS
diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index edb089160..c10813e9d 100644
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -121,7 +121,7 @@ MKDIRS := $(BIN)
 all: dirs binary doc
 binary: library program
 maintainer-clean dist-clean distclean pristine sanity: veryclean
-headers library clean veryclean program test:
+startup headers library clean veryclean program test update-po:
 
 veryclean:
 	echo Very Clean done for $(SUBDIR)
diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index fdac3e6c3..0f0fac095 100644
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -2,6 +2,7 @@
 # if you want you can edit it, just don't re-run configure.
 
 PACKAGE = @PACKAGE@
+PACKAGE_VERSION = @PACKAGE_VERSION@
 
 # C++ compiler options
 CC = @CC@
@@ -54,7 +55,8 @@ INTLLIBS = @INTLLIBS@
 # Shim Headerfile control
 HAVE_C9X = @HAVE_C9X@
 HAVE_STATVFS = @HAVE_STATVFS@
-HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_ZLIB = @HAVE_ZLIB@
+HAVE_BZ2 = @HAVE_BZ2@
 NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
 
 # Shared library things
diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak
index 511a5cae2..bb1c77e47 100644
--- a/buildlib/podomain.mak
+++ b/buildlib/podomain.mak
@@ -14,7 +14,7 @@ MKDIRS += $(PO_DOMAINS)/$(MY_DOMAIN)
 $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: SRC := $(addprefix $(SUBDIR)/,$(SOURCE))
 $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile
 	(echo $(SRC) | xargs -n1 echo) > $@
-binary program clean: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
+startup binary program clean: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
 
 veryclean: veryclean/$(LOCAL)
 veryclean/po/$(LOCAL): LIST := $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc
index ba334ce05..3ac350aca 100644
--- a/cmdline/acqprogress.cc
+++ b/cmdline/acqprogress.cc
@@ -8,19 +8,21 @@
    ##################################################################### */
 									/*}}}*/
 // Include files							/*{{{*/
-#include "acqprogress.h"
+#include<config.h>
+
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/acquire-worker.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 
-#include <apti18n.h>
-    
 #include <stdio.h>
 #include <signal.h>
 #include <iostream>
 #include <unistd.h>
+
+#include "acqprogress.h"
+#include <apti18n.h>
 									/*}}}*/
 
 using namespace std;
@@ -29,8 +31,9 @@ using namespace std;
 // ---------------------------------------------------------------------
 /* */
 AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet) :
-    ScreenWidth(ScreenWidth), Quiet(Quiet)
+    ScreenWidth(ScreenWidth), ID(0), Quiet(Quiet)
 {
+   BlankLine[0] = 0;
 }
 									/*}}}*/
 // AcqTextStatus::Start - Downloading has started			/*{{{*/
@@ -161,7 +164,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
       ScreenWidth = sizeof(Buffer)-1;
 
    // Put in the percent done
-   sprintf(S,"%ld%%",long(double((CurrentBytes + CurrentItems)*100.0)/double(TotalBytes+TotalItems)));
+   sprintf(S,"%.0f%%",((CurrentBytes + CurrentItems)*100.0)/(TotalBytes+TotalItems));
 
    bool Shown = false;
    for (pkgAcquire::Worker *I = Owner->WorkersBegin(); I != 0;
@@ -200,7 +203,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
             
       // Add the current progress
       if (Mode == Long)
-	 snprintf(S,End-S," %lu",I->CurrentSize);
+	 snprintf(S,End-S," %llu",I->CurrentSize);
       else
       {
 	 if (Mode == Medium || I->TotalSize == 0)
@@ -212,11 +215,11 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
       if (I->TotalSize > 0 && I->CurrentItem->Owner->Complete == false)
       {
 	 if (Mode == Short)
-	    snprintf(S,End-S," %lu%%",
-		     long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
+	    snprintf(S,End-S," %.0f%%",
+		     (I->CurrentSize*100.0)/I->TotalSize);
 	 else
-	    snprintf(S,End-S,"/%sB %lu%%",SizeToStr(I->TotalSize).c_str(),
-		     long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
+	    snprintf(S,End-S,"/%sB %.0f%%",SizeToStr(I->TotalSize).c_str(),
+		     (I->CurrentSize*100.0)/I->TotalSize);
       }      
       S += strlen(S);
       snprintf(S,End-S,"]");
@@ -236,7 +239,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
    if (CurrentCPS != 0)
    {      
       char Tmp[300];
-      unsigned long ETA = (unsigned long)((TotalBytes - CurrentBytes)/CurrentCPS);
+      unsigned long long ETA = (TotalBytes - CurrentBytes)/CurrentCPS;
       sprintf(Tmp," %sB/s %s",SizeToStr(CurrentCPS).c_str(),TimeToStr(ETA).c_str());
       unsigned int Len = strlen(Buffer);
       unsigned int LenT = strlen(Tmp);
diff --git a/cmdline/acqprogress.h b/cmdline/acqprogress.h
index 48f90ae59..8f0903923 100644
--- a/cmdline/acqprogress.h
+++ b/cmdline/acqprogress.h
@@ -12,6 +12,8 @@
 
 #include <apt-pkg/acquire.h>
 
+#include <string>
+
 class AcqTextStatus : public pkgAcquireStatus
 {
    unsigned int &ScreenWidth;
@@ -21,7 +23,7 @@ class AcqTextStatus : public pkgAcquireStatus
    
    public:
    
-   virtual bool MediaChange(string Media,string Drive);
+   virtual bool MediaChange(std::string Media,std::string Drive);
    virtual void IMSHit(pkgAcquire::ItemDesc &Itm);
    virtual void Fetch(pkgAcquire::ItemDesc &Itm);
    virtual void Done(pkgAcquire::ItemDesc &Itm);
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index db5475227..ce869581b 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -13,9 +13,9 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/error.h>
-#include <cassert>
-#include <apt-pkg/pkgcachegen.h>
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/init.h>
@@ -23,6 +23,7 @@
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/version.h>
@@ -30,18 +31,21 @@
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/sptr.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/indexfile.h>
+#include <apt-pkg/metaindex.h>
 
-#include <config.h>
-#include <apti18n.h>
-
+#include <cassert>
 #include <locale.h>
 #include <iostream>
 #include <unistd.h>
 #include <errno.h>
 #include <regex.h>
 #include <stdio.h>
-
 #include <iomanip>
+#include <algorithm>
+
+#include <apti18n.h>
 									/*}}}*/
 
 using namespace std;
@@ -61,12 +65,12 @@ public:
       return CacheSetHelper::canNotFindNewestVer(Cache, Pkg);
    }
 
-   virtual APT::VersionSet canNotFindAllVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) {
+   virtual void canNotFindAllVer(APT::VersionContainerInterface * vci, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) {
       virtualPkgs.insert(Pkg);
-      return CacheSetHelper::canNotFindAllVer(Cache, Pkg);
+      CacheSetHelper::canNotFindAllVer(vci, Cache, Pkg);
    }
 
-   CacheSetHelperVirtuals(bool const &ShowErrors = true, GlobalError::MsgType const &ErrorType = GlobalError::NOTICE) : CacheSetHelper(ShowErrors, ErrorType) {}
+   CacheSetHelperVirtuals(bool const ShowErrors = true, GlobalError::MsgType const &ErrorType = GlobalError::NOTICE) : CacheSetHelper(ShowErrors, ErrorType) {}
 };
 									/*}}}*/
 // LocalitySort - Sort a version list by package file locality		/*{{{*/
@@ -104,7 +108,7 @@ void LocalitySort(pkgCache::DescFile **begin,
 // UnMet - Show unmet dependencies					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool ShowUnMet(pkgCache::VerIterator const &V, bool const &Important)
+bool ShowUnMet(pkgCache::VerIterator const &V, bool const Important)
 {
 	 bool Header = false;
 	 for (pkgCache::DepIterator D = V.DependsList(); D.end() == false;)
@@ -195,9 +199,9 @@ bool UnMet(CommandLine &CmdL)
    else
    {
       CacheSetHelperVirtuals helper(true, GlobalError::NOTICE);
-      APT::VersionSet verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1,
-				APT::VersionSet::CANDIDATE, helper);
-      for (APT::VersionSet::iterator V = verset.begin(); V != verset.end(); ++V)
+      APT::VersionList verset = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1,
+				APT::VersionList::CANDIDATE, helper);
+      for (APT::VersionList::iterator V = verset.begin(); V != verset.end(); ++V)
 	 if (ShowUnMet(V, Important) == false)
 	    return false;
    }
@@ -211,9 +215,9 @@ bool DumpPackage(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
    APT::CacheSetHelper helper(true, GlobalError::NOTICE);
-   APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1, helper);
+   APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1, helper);
 
-   for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
+   for (APT::PackageList::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
    {
       cout << "Package: " << Pkg.FullName(true) << endl;
       cout << "Versions: " << endl;
@@ -584,7 +588,7 @@ bool ShowDepends(CommandLine &CmdL, bool const RevDepends)
       return false;
 
    CacheSetHelperVirtuals helper(false);
-   APT::VersionSet verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper);
+   APT::VersionList verset = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::VersionList::CANDIDATE, helper);
    if (verset.empty() == true && helper.virtualPkgs.empty() == true)
       return _error->Error(_("No packages found"));
    std::vector<bool> Shown(Cache->Head().PackageCount);
@@ -1139,7 +1143,7 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V)
       return _error->Error(_("Package file %s is out of sync."),I.FileName());
 
    FileFd PkgF;
-   if (PkgF.Open(I.FileName(), FileFd::ReadOnlyGzip) == false)
+   if (PkgF.Open(I.FileName(), FileFd::ReadOnly, FileFd::Extension) == false)
       return false;
 
    // Read the record
@@ -1361,10 +1365,10 @@ bool ShowPackage(CommandLine &CmdL)
 {
    pkgCacheFile CacheFile;
    CacheSetHelperVirtuals helper(true, GlobalError::NOTICE);
-   APT::VersionSet::Version const select = _config->FindB("APT::Cache::AllVersions", true) ?
-			APT::VersionSet::ALL : APT::VersionSet::CANDIDATE;
-   APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, select, helper);
-   for (APT::VersionSet::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver)
+   APT::VersionList::Version const select = _config->FindB("APT::Cache::AllVersions", true) ?
+			APT::VersionList::ALL : APT::VersionList::CANDIDATE;
+   APT::VersionList const verset = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, select, helper);
+   for (APT::VersionList::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver)
       if (DisplayRecord(CacheFile, Ver) == false)
 	 return false;
 
@@ -1527,8 +1531,8 @@ bool Policy(CommandLine &CmdL)
 
    // Print out detailed information for each package
    APT::CacheSetHelper helper(true, GlobalError::NOTICE);
-   APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1, helper);
-   for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
+   APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1, helper);
+   for (APT::PackageList::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
    {
       cout << Pkg.FullName(true) << ":" << endl;
 
@@ -1604,8 +1608,8 @@ bool Madison(CommandLine &CmdL)
    for (const char **I = CmdL.FileList + 1; *I != 0; I++)
    {
       _error->PushToStack();
-      APT::PackageSet pkgset = APT::PackageSet::FromString(CacheFile, *I, helper);
-      for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
+      APT::PackageList pkgset = APT::PackageList::FromString(CacheFile, *I, helper);
+      for (APT::PackageList::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
       {
          for (pkgCache::VerIterator V = Pkg.VersionList(); V.end() == false; ++V)
          {
@@ -1672,7 +1676,7 @@ bool GenCaches(CommandLine &Cmd)
 /* */
 bool ShowHelp(CommandLine &Cmd)
 {
-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
 	    COMMON_ARCH,__DATE__,__TIME__);
    
    if (_config->FindB("version") == true)
@@ -1735,7 +1739,7 @@ int main(int argc,const char *argv[])					/*{{{*/
       {'c',"config-file",0,CommandLine::ConfigFile},
       {'o',"option",0,CommandLine::ArbItem},
       {0,"installed","APT::Cache::Installed",0},
-      {0,"pre-depends","APT::Cache::ShowPreDepends",0},
+      {0,"pre-depends","APT::Cache::ShowPre-Depends",0},
       {0,"depends","APT::Cache::ShowDepends",0},
       {0,"recommends","APT::Cache::ShowRecommends",0},
       {0,"suggests","APT::Cache::ShowSuggests",0},
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index d1268edf9..2551f4916 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -11,6 +11,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/init.h>
@@ -21,10 +23,8 @@
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/cdrom.h>
-#include <config.h>
-#include <apti18n.h>
-    
-//#include "indexcopy.h"
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/pkgsystem.h>
 
 #include <locale.h>
 #include <iostream>
@@ -36,6 +36,8 @@
 #include <dirent.h>
 #include <unistd.h>
 #include <stdio.h>
+
+#include <apti18n.h>
 									/*}}}*/
 
 using namespace std;
@@ -148,10 +150,9 @@ 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 {
@@ -176,10 +177,10 @@ bool DoIdent(CommandLine &)
    bool res = true;
 
    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 {
@@ -194,7 +195,7 @@ bool DoIdent(CommandLine &)
 /* */
 int ShowHelp()
 {
-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
 	    COMMON_ARCH,__DATE__,__TIME__);
    if (_config->FindB("version") == true)
       return 0;
diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index 589ee7ada..79ae944df 100644
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -16,20 +16,22 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/init.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/aptconfiguration.h>
-
-#include <config.h>
-#include <apti18n.h>
+#include <apt-pkg/pkgsystem.h>
 
 #include <locale.h>
 #include <iostream>
 #include <string>
 #include <vector>
+
+#include <apti18n.h>
 									/*}}}*/
 using namespace std;
 
@@ -70,7 +72,7 @@ bool DoDump(CommandLine &CmdL)
 /* */
 int ShowHelp()
 {
-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
 	    COMMON_ARCH,__DATE__,__TIME__);
    if (_config->FindB("version") == true)
       return 0;
@@ -132,6 +134,22 @@ int main(int argc,const char *argv[])					/*{{{*/
    for (std::vector<std::string>::const_iterator a = archs.begin(); a != archs.end(); ++a)
       _config->Set("APT::Architectures::", *a);
 
+   std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors();
+   _config->Clear("APT::Compressor");
+   string conf = "APT::Compressor::";
+   for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressors.begin(); c != compressors.end(); ++c)
+   {
+      string comp = conf + c->Name + "::";
+      _config->Set(comp + "Name", c->Name);
+      _config->Set(comp + "Extension", c->Extension);
+      _config->Set(comp + "Binary", c->Binary);
+      _config->Set(std::string(comp + "Cost").c_str(), c->Cost);
+      for (std::vector<std::string>::const_iterator a = c->CompressArgs.begin(); a != c->CompressArgs.end(); ++a)
+	 _config->Set(comp + "CompressArg::", *a);
+      for (std::vector<std::string>::const_iterator a = c->UncompressArgs.begin(); a != c->UncompressArgs.end(); ++a)
+	 _config->Set(comp + "UncompressArg::", *a);
+   }
+
    // Match the operation
    CmdL.DispatchArg(Cmds);
    
diff --git a/cmdline/apt-dump-solver.cc b/cmdline/apt-dump-solver.cc
new file mode 100644
index 000000000..aa16b1271
--- /dev/null
+++ b/cmdline/apt-dump-solver.cc
@@ -0,0 +1,51 @@
+// -*- mode: cpp; mode: fold -*-
+// Description								/*{{{*/
+/* #####################################################################
+
+   dummy solver to get quickly a scenario file out of APT
+
+   ##################################################################### */
+									/*}}}*/
+// Include Files							/*{{{*/
+#include <apt-pkg/edsp.h>
+
+#include <config.h>
+
+#include <cstdio>
+#include <iostream>
+									/*}}}*/
+
+// ShowHelp - Show a help screen					/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool ShowHelp() {
+
+	std::cout <<
+		PACKAGE " " PACKAGE_VERSION " for " COMMON_ARCH " compiled on " __DATE__ " " __TIME__ << std::endl <<
+		"Usage: apt-dump-resolver\n"
+		"\n"
+		"apt-dump-resolver is a dummy solver who just dumps its input to the\n"
+		"file /tmp/dump.edsp and exists with a proper EDSP error.\n"
+		"\n"
+		"                       This dump has lost Super Cow Powers.\n";
+	return true;
+}
+									/*}}}*/
+int main(int argc,const char *argv[])					/*{{{*/
+{
+	if (argc > 1 && (strcmp(argv[1], "--help") == 0 || strcmp(argv[1],"-h") == 0 ||
+	    strcmp(argv[1],"-v") == 0 || strcmp(argv[1],"--version") == 0)) {
+		ShowHelp();
+		return 0;
+	}
+
+	FILE* input = fdopen(STDIN_FILENO, "r");
+	FILE* output = fopen("/tmp/dump.edsp", "w");
+	char buffer[400];
+	while (fgets(buffer, sizeof(buffer), input) != NULL)
+		fputs(buffer, output);
+	fclose(output);
+	fclose(input);
+
+	EDSP::WriteError("ERR_JUST_DUMPING", "I am too dumb, i can just dump!\nPlease use one of my friends instead!", stdout);
+}
diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 07bc0c25d..60efafba5 100644
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -13,6 +13,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include<config.h>
+
 #include <apt-pkg/init.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/pkgcache.h>
@@ -28,7 +30,8 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
-	
+#include <apt-pkg/pkgsystem.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -36,7 +39,6 @@
 #include <fstream>
 
 #include <locale.h>
-#include <config.h>
 #include <apti18n.h>
 #include "apt-extracttemplates.h"
 									/*}}}*/
@@ -51,8 +53,8 @@ pkgCache *DebFile::Cache = 0;
 // ---------------------------------------------------------------------
 /* */
 DebFile::DebFile(const char *debfile)
-	: File(debfile, FileFd::ReadOnly), Control(0), DepOp(0), 
-          PreDepOp(0), Config(0), Template(0), Which(None)
+	: File(debfile, FileFd::ReadOnly), Size(0), Control(NULL), ControlLen(0),
+	  DepOp(0), PreDepOp(0), Config(0), Template(0), Which(None)
 {
 }
 									/*}}}*/
@@ -222,7 +224,7 @@ bool DebFile::ParseInfo()
 /* */
 int ShowHelp(void)
 {
-   	ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+   	ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
 	    COMMON_ARCH,__DATE__,__TIME__);
 
 	if (_config->FindB("version") == true) 
diff --git a/cmdline/apt-extracttemplates.h b/cmdline/apt-extracttemplates.h
index d0f90d3f4..6d07a09c2 100644
--- a/cmdline/apt-extracttemplates.h
+++ b/cmdline/apt-extracttemplates.h
@@ -14,6 +14,8 @@
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/dirstream.h>
 
+#include <string>
+
 class DebFile : public pkgDirStream
 {
 	FileFd File;
@@ -31,11 +33,11 @@ public:
 	bool Go();
 	bool ParseInfo();
 
-	static string GetInstalledVer(const string &package);
+	static std::string GetInstalledVer(const std::string &package);
 
-	string Package;
-	string Version;
-	string DepVer, PreDepVer;
+	std::string Package;
+	std::string Version;
+	std::string DepVer, PreDepVer;
 	unsigned int DepOp, PreDepOp;
 
 	char *Config;
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 49ac8f2cf..4e6cc32de 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -25,8 +25,7 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#define _LARGEFILE_SOURCE
-#define _LARGEFILE64_SOURCE
+#include <config.h>
 
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/error.h>
@@ -37,6 +36,7 @@
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
 #include <apt-pkg/clean.h>
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/version.h>
@@ -45,9 +45,10 @@
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/versionmatch.h>
-
-#include <config.h>
-#include <apti18n.h>
+#include <apt-pkg/progress.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/indexfile.h>
 
 #include "acqprogress.h"
 
@@ -68,8 +69,7 @@
 #include <sys/wait.h>
 #include <sstream>
 
-#define statfs statfs64
-#define statvfs statvfs64
+#include <apti18n.h>
 									/*}}}*/
 
 #define RAMFS_MAGIC     0x858458f6
@@ -135,6 +135,11 @@ bool YnPrompt(bool Default=true)
       c1out << _("Y") << endl;
       return true;
    }
+   else if (_config->FindB("APT::Get::Assume-No",false) == true)
+   {
+      c1out << _("N") << endl;
+      return false;
+   }
 
    char response[1024] = "";
    cin.getline(response, sizeof(response));
@@ -623,20 +628,18 @@ public:
 		explicitlyNamed = true;
 	}
 
-	virtual void showTaskSelection(APT::PackageSet const &pkgset, string const &pattern) {
-		for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
-			ioprintf(out, _("Note, selecting '%s' for task '%s'\n"),
-				 Pkg.FullName(true).c_str(), pattern.c_str());
+	virtual void showTaskSelection(pkgCache::PkgIterator const &Pkg, string const &pattern) {
+		ioprintf(out, _("Note, selecting '%s' for task '%s'\n"),
+				Pkg.FullName(true).c_str(), pattern.c_str());
 		explicitlyNamed = false;
 	}
-	virtual void showRegExSelection(APT::PackageSet const &pkgset, string const &pattern) {
-		for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
-			ioprintf(out, _("Note, selecting '%s' for regex '%s'\n"),
-				 Pkg.FullName(true).c_str(), pattern.c_str());
+	virtual void showRegExSelection(pkgCache::PkgIterator const &Pkg, string const &pattern) {
+		ioprintf(out, _("Note, selecting '%s' for regex '%s'\n"),
+				Pkg.FullName(true).c_str(), pattern.c_str());
 		explicitlyNamed = false;
 	}
 	virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver,
-				 string const &ver, bool const &verIsRel) {
+				 string const &ver, bool const verIsRel) {
 		if (ver == Ver.VerStr())
 			return;
 		selectedByRelease.push_back(make_pair(Ver, ver));
@@ -702,7 +705,7 @@ public:
 		APT::VersionSet const verset = tryVirtualPackage(Cache, Pkg, APT::VersionSet::CANDIDATE);
 		if (verset.empty() == false)
 			return *(verset.begin());
-		if (ShowError == true) {
+		else if (ShowError == true) {
 			_error->Error(_("Package '%s' has no installation candidate"),Pkg.FullName(true).c_str());
 			virtualPkgs.insert(Pkg);
 		}
@@ -710,11 +713,32 @@ public:
 	}
 
 	virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) {
-		APT::VersionSet const verset = tryVirtualPackage(Cache, Pkg, APT::VersionSet::NEWEST);
-		if (verset.empty() == false)
-			return *(verset.begin());
-		if (ShowError == true)
-			ioprintf(out, _("Virtual packages like '%s' can't be removed\n"), Pkg.FullName(true).c_str());
+		if (Pkg->ProvidesList != 0)
+		{
+			APT::VersionSet const verset = tryVirtualPackage(Cache, Pkg, APT::VersionSet::NEWEST);
+			if (verset.empty() == false)
+				return *(verset.begin());
+			if (ShowError == true)
+				ioprintf(out, _("Virtual packages like '%s' can't be removed\n"), Pkg.FullName(true).c_str());
+		}
+		else
+		{
+			pkgCache::GrpIterator Grp = Pkg.Group();
+			pkgCache::PkgIterator P = Grp.PackageList();
+			for (; P.end() != true; P = Grp.NextPkg(P))
+			{
+				if (P == Pkg)
+					continue;
+				if (P->CurrentVer != 0) {
+					// TRANSLATORS: Note, this is not an interactive question
+					ioprintf(c1out,_("Package '%s' is not installed, so not removed. Did you mean '%s'?\n"),
+						 Pkg.FullName(true).c_str(), P.FullName(true).c_str());
+					break;
+				}
+			}
+			if (P.end() == true)
+				ioprintf(c1out,_("Package '%s' is not installed, so not removed\n"),Pkg.FullName(true).c_str());
+		}
 		return pkgCache::VerIterator(Cache, 0);
 	}
 
@@ -739,6 +763,19 @@ public:
 				Prov = PPkg;
 				found_one = true;
 			} else if (PPkg != Prov) {
+				// same group, so it's a foreign package
+				if (PPkg->Group == Prov->Group) {
+					// do we already have the requested arch?
+					if (strcmp(Pkg.Arch(), Prov.Arch()) == 0 ||
+					    strcmp(Prov.Arch(), "all") == 0 ||
+					    unlikely(strcmp(PPkg.Arch(), Prov.Arch()) == 0)) // packages have only on candidate, but just to be sure
+						continue;
+					// see which architecture we prefer more and switch to it
+					std::vector<std::string> archs = APT::Configuration::getArchitectures();
+					if (std::find(archs.begin(), archs.end(), PPkg.Arch()) < std::find(archs.begin(), archs.end(), Prov.Arch()))
+						Prov = PPkg;
+					continue;
+				}
 				found_one = false; // we found at least two
 				break;
 			}
@@ -764,7 +801,7 @@ struct TryToInstall {
    unsigned long AutoMarkChanged;
    APT::PackageSet doAutoInstallLater;
 
-   TryToInstall(pkgCacheFile &Cache, pkgProblemResolver *PM, bool const &FixBroken) : Cache(&Cache), Fix(PM),
+   TryToInstall(pkgCacheFile &Cache, pkgProblemResolver *PM, bool const FixBroken) : Cache(&Cache), Fix(PM),
 			FixBroken(FixBroken), AutoMarkChanged(0) {};
 
    void operator() (pkgCache::VerIterator const &Ver) {
@@ -888,7 +925,23 @@ struct TryToRemove {
       if ((Pkg->CurrentVer == 0 && PurgePkgs == false) ||
 	  (PurgePkgs == true && Pkg->CurrentState == pkgCache::State::NotInstalled))
       {
-	 ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.FullName(true).c_str());
+	 pkgCache::GrpIterator Grp = Pkg.Group();
+	 pkgCache::PkgIterator P = Grp.PackageList();
+	 for (; P.end() != true; P = Grp.NextPkg(P))
+	 {
+	    if (P == Pkg)
+	       continue;
+	    if (P->CurrentVer != 0 || (PurgePkgs == true && P->CurrentState != pkgCache::State::NotInstalled))
+	    {
+	       // TRANSLATORS: Note, this is not an interactive question
+	       ioprintf(c1out,_("Package '%s' is not installed, so not removed. Did you mean '%s'?\n"),
+			Pkg.FullName(true).c_str(), P.FullName(true).c_str());
+	       break;
+	    }
+	 }
+	 if (P.end() == true)
+	    ioprintf(c1out,_("Package '%s' is not installed, so not removed\n"),Pkg.FullName(true).c_str());
+
 	 // MarkInstall refuses to install packages on hold
 	 Pkg->SelectedState = pkgCache::State::Hold;
       }
@@ -1362,7 +1415,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
 	"all files have been overwritten by other packages:",
 	"The following packages disappeared from your system as\n"
 	"all files have been overwritten by other packages:", disappearedPkgs.size()), disappear, "");
-   c0out << _("Note: This is done automatic and on purpose by dpkg.") << std::endl;
+   c0out << _("Note: This is done automatically and on purpose by dpkg.") << std::endl;
 
    return true;
 }
@@ -1658,12 +1711,13 @@ bool DoAutomaticRemove(CacheFile &Cache)
    bool smallList = (hideAutoRemove == false &&
 		strcasecmp(_config->Find("APT::Get::HideAutoRemove","").c_str(),"small") == 0);
 
-   string autoremovelist, autoremoveversions;
    unsigned long autoRemoveCount = 0;
    APT::PackageSet tooMuch;
+   APT::PackageList autoRemoveList;
    // look over the cache to see what can be removed
-   for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg)
+   for (unsigned J = 0; J < Cache->Head().PackageCount; ++J)
    {
+      pkgCache::PkgIterator Pkg(Cache,Cache.List[J]);
       if (Cache[Pkg].Garbage)
       {
 	 if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install())
@@ -1680,6 +1734,8 @@ bool DoAutomaticRemove(CacheFile &Cache)
 	 }
 	 else
 	 {
+	    if (hideAutoRemove == false && Cache[Pkg].Delete() == false)
+	       autoRemoveList.insert(Pkg);
 	    // if the package is a new install and already garbage we don't need to
 	    // install it in the first place, so nuke it instead of show it
 	    if (Cache[Pkg].Install() == true && Pkg.CurrentVer() == 0)
@@ -1689,16 +1745,8 @@ bool DoAutomaticRemove(CacheFile &Cache)
 	       Cache->MarkDelete(Pkg, false);
 	    }
 	    // only show stuff in the list that is not yet marked for removal
-	    else if(hideAutoRemove == false && Cache[Pkg].Delete() == false) 
-	    {
+	    else if(hideAutoRemove == false && Cache[Pkg].Delete() == false)
 	       ++autoRemoveCount;
-	       // we don't need to fill the strings if we don't need them
-	       if (smallList == false)
-	       {
-		 autoremovelist += Pkg.FullName(true) + " ";
-		 autoremoveversions += string(Cache[Pkg].CandVersion) + "\n";
-	       }
-	    }
 	 }
       }
    }
@@ -1714,7 +1762,7 @@ bool DoAutomaticRemove(CacheFile &Cache)
 	      Pkg != tooMuch.end() && Changed == false; ++Pkg)
 	 {
 	    APT::PackageSet too;
-	    too.insert(Pkg);
+	    too.insert(*Pkg);
 	    for (pkgCache::PrvIterator Prv = Cache[Pkg].CandidateVerIter(Cache).ProvidesList();
 		 Prv.end() == false; ++Prv)
 	       too.insert(Prv.ParentPkg());
@@ -1733,14 +1781,7 @@ bool DoAutomaticRemove(CacheFile &Cache)
 		    std::clog << "Save " << Pkg << " as another installed garbage package depends on it" << std::endl;
 		 Cache->MarkInstall(Pkg, false);
 		 if (hideAutoRemove == false)
-		 {
 		    ++autoRemoveCount;
-		    if (smallList == false)
-		    {
-		       autoremovelist += Pkg.FullName(true) + " ";
-		       autoremoveversions += string(Cache[Pkg].CandVersion) + "\n";
-		    }
-		 }
 		 tooMuch.erase(Pkg);
 		 Changed = true;
 		 break;
@@ -1750,6 +1791,18 @@ bool DoAutomaticRemove(CacheFile &Cache)
       } while (Changed == true);
    }
 
+   std::string autoremovelist, autoremoveversions;
+   if (smallList == false && autoRemoveCount != 0)
+   {
+      for (APT::PackageList::const_iterator Pkg = autoRemoveList.begin(); Pkg != autoRemoveList.end(); ++Pkg)
+      {
+	 if (Cache[Pkg].Garbage == false)
+	    continue;
+	 autoremovelist += Pkg.FullName(true) + " ";
+	 autoremoveversions += string(Cache[Pkg].CandVersion) + "\n";
+      }
+   }
+
    // Now see if we had destroyed anything (if we had done anything)
    if (Cache->BrokenCount() != 0)
    {
@@ -1773,7 +1826,7 @@ bool DoAutomaticRemove(CacheFile &Cache)
       else
 	 ioprintf(c1out, P_("%lu package was automatically installed and is no longer required.\n",
 	          "%lu packages were automatically installed and are no longer required.\n", autoRemoveCount), autoRemoveCount);
-      c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl;
+      c1out << P_("Use 'apt-get autoremove' to remove it.", "Use 'apt-get autoremove' to remove them.", autoRemoveCount) << std::endl;
    }
    return true;
 }
@@ -1902,8 +1955,7 @@ bool DoInstall(CommandLine &CmdL)
       {
 	 // Call the scored problem resolver
 	 Fix->InstallProtect();
-	 if (Fix->Resolve(true) == false)
-	    _error->Discard();
+	 Fix->Resolve(true);
 	 delete Fix;
       }
 
@@ -1929,8 +1981,11 @@ bool DoInstall(CommandLine &CmdL)
 	 c1out << _("The following information may help to resolve the situation:") << endl;
 	 c1out << endl;
 	 ShowBroken(c1out,Cache,false);
-	 return _error->Error(_("Broken packages"));
-      }   
+	 if (_error->PendingError() == true)
+	    return false;
+	 else
+	    return _error->Error(_("Broken packages"));
+      }
    }
    if (!DoAutomaticRemove(Cache)) 
       return false;
@@ -2288,8 +2343,8 @@ bool DoDownload(CommandLine &CmdL)
       return false;
    
    APT::CacheSetHelper helper(c0out);
-   APT::VersionSet verset = APT::VersionSet::FromCommandLine(Cache,
-		CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper);
+   APT::VersionList verset = APT::VersionList::FromCommandLine(Cache,
+		CmdL.FileList + 1, APT::VersionList::CANDIDATE, helper);
 
    if (verset.empty() == true)
       return false;
@@ -2301,7 +2356,7 @@ bool DoDownload(CommandLine &CmdL)
 
    pkgRecords Recs(Cache);
    pkgSourceList *SrcList = Cache.GetSourceList();
-   for (APT::VersionSet::const_iterator Ver = verset.begin(); 
+   for (APT::VersionList::const_iterator Ver = verset.begin(); 
         Ver != verset.end(); 
         ++Ver) 
    {
@@ -2320,6 +2375,8 @@ bool DoDownload(CommandLine &CmdL)
       strprintf(descr, _("Downloading %s %s"), Pkg.Name(), Ver.VerStr());
       // get the most appropriate hash
       HashString hash;
+      if (rec.SHA512Hash() != "")
+         hash = HashString("sha512", rec.SHA512Hash());
       if (rec.SHA256Hash() != "")
          hash = HashString("sha256", rec.SHA256Hash());
       else if (rec.SHA1Hash() != "")
@@ -2807,7 +2864,7 @@ bool DoBuildDep(CommandLine &CmdL)
 	    pkgCache::PkgIterator Pkg;
 
 	    // Cross-Building?
-	    if (StripMultiArch == false)
+	    if (StripMultiArch == false && D->Type != pkgSrcRecords::Parser::BuildDependIndep)
 	    {
 	       size_t const colon = D->Package.find(":");
 	       if (colon != string::npos &&
@@ -2843,21 +2900,27 @@ bool DoBuildDep(CommandLine &CmdL)
 	       if ((BADVER(Ver)) == false)
 	       {
 		  string forbidden;
-		  if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All);
+		  if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All)
+		  {
+		     if (colon == string::npos)
+		     {
+			Pkg = Ver.ParentPkg().Group().FindPkg(hostArch);
+		     }
+		  }
 		  else if (Ver->MultiArch == pkgCache::Version::Same)
 		  {
-		     if (colon != string::npos)
+		     if (colon == string::npos)
 			Pkg = Ver.ParentPkg().Group().FindPkg(hostArch);
 		     else if (strcmp(D->Package.c_str() + colon, ":any") == 0)
 			forbidden = "Multi-Arch: same";
 		     // :native gets the buildArch
 		  }
-		  else if (Ver->MultiArch == pkgCache::Version::Foreign || Ver->MultiArch == pkgCache::Version::AllForeign)
+		  else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign)
 		  {
 		     if (colon != string::npos)
 			forbidden = "Multi-Arch: foreign";
 		  }
-		  else if (Ver->MultiArch == pkgCache::Version::Allowed || Ver->MultiArch == pkgCache::Version::AllAllowed)
+		  else if ((Ver->MultiArch & pkgCache::Version::Allowed) == pkgCache::Version::Allowed)
 		  {
 		     if (colon == string::npos)
 			Pkg = Ver.ParentPkg().Group().FindPkg(hostArch);
@@ -3158,14 +3221,14 @@ bool DoChangelog(CommandLine &CmdL)
       return false;
    
    APT::CacheSetHelper helper(c0out);
-   APT::VersionSet verset = APT::VersionSet::FromCommandLine(Cache,
-		CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper);
+   APT::VersionList verset = APT::VersionList::FromCommandLine(Cache,
+		CmdL.FileList + 1, APT::VersionList::CANDIDATE, helper);
    if (verset.empty() == true)
       return false;
    pkgAcquire Fetcher;
 
    if (_config->FindB("APT::Get::Print-URIs", false) == true)
-      for (APT::VersionSet::const_iterator Ver = verset.begin();
+      for (APT::VersionList::const_iterator Ver = verset.begin();
 	   Ver != verset.end(); ++Ver)
 	 return DownloadChangelog(Cache, Fetcher, Ver, "");
 
@@ -3188,7 +3251,7 @@ bool DoChangelog(CommandLine &CmdL)
 	 return _error->Errno("mkdtemp", "mkdtemp failed");
    }
 
-   for (APT::VersionSet::const_iterator Ver = verset.begin(); 
+   for (APT::VersionList::const_iterator Ver = verset.begin(); 
         Ver != verset.end(); 
         ++Ver) 
    {
@@ -3232,7 +3295,7 @@ bool DoMoo(CommandLine &CmdL)
 /* */
 bool ShowHelp(CommandLine &CmdL)
 {
-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
 	    COMMON_ARCH,__DATE__,__TIME__);
 	    
    if (_config->FindB("version") == true)
@@ -3354,7 +3417,8 @@ int main(int argc,const char *argv[])					/*{{{*/
       {'s',"dry-run","APT::Get::Simulate",0},
       {'s',"no-act","APT::Get::Simulate",0},
       {'y',"yes","APT::Get::Assume-Yes",0},
-      {'y',"assume-yes","APT::Get::Assume-Yes",0},      
+      {'y',"assume-yes","APT::Get::Assume-Yes",0},
+      {0,"assume-no","APT::Get::Assume-No",0},
       {'f',"fix-broken","APT::Get::Fix-Broken",0},
       {'u',"show-upgraded","APT::Get::Show-Upgraded",0},
       {'m',"ignore-missing","APT::Get::Fix-Missing",0},
@@ -3384,6 +3448,7 @@ int main(int argc,const char *argv[])					/*{{{*/
       {0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean},
       {0,"install-suggests","APT::Install-Suggests",CommandLine::Boolean},
       {0,"fix-policy","APT::Get::Fix-Policy-Broken",0},
+      {0,"solver","APT::Solver",CommandLine::HasArg},
       {'c',"config-file",0,CommandLine::ConfigFile},
       {'o',"option",0,CommandLine::ArbItem},
       {0,0,0,0}};
diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
new file mode 100644
index 000000000..25ecb7af1
--- /dev/null
+++ b/cmdline/apt-internal-solver.cc
@@ -0,0 +1,192 @@
+// -*- mode: cpp; mode: fold -*-
+// Description								/*{{{*/
+/* #####################################################################
+
+   cover around the internal solver to be able to run it like an external
+
+   ##################################################################### */
+									/*}}}*/
+// Include Files							/*{{{*/
+#include <apt-pkg/error.h>
+#include <apt-pkg/cmndline.h>
+#include <apt-pkg/init.h>
+#include <apt-pkg/cachefile.h>
+#include <apt-pkg/cacheset.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/edsp.h>
+#include <apt-pkg/algorithms.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/pkgsystem.h>
+
+#include <config.h>
+#include <apti18n.h>
+
+#include <unistd.h>
+#include <cstdio>
+									/*}}}*/
+
+// ShowHelp - Show a help screen					/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool ShowHelp(CommandLine &CmdL) {
+	ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
+		 COMMON_ARCH,__DATE__,__TIME__);
+
+	std::cout <<
+		_("Usage: apt-internal-resolver\n"
+		"\n"
+		"apt-internal-resolver 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"
+		"apt.conf(5) manual pages for more information and options.\n"
+		"                       This APT has Super Cow Powers.\n");
+	return true;
+}
+									/*}}}*/
+int main(int argc,const char *argv[])					/*{{{*/
+{
+	CommandLine::Args Args[] = {
+		{'h',"help","help",0},
+		{'v',"version","version",0},
+		{'q',"quiet","quiet",CommandLine::IntLevel},
+		{'q',"silent","quiet",CommandLine::IntLevel},
+		{'c',"config-file",0,CommandLine::ConfigFile},
+		{'o',"option",0,CommandLine::ArbItem},
+		{0,0,0,0}};
+
+	CommandLine CmdL(Args,_config);
+	if (pkgInitConfig(*_config) == false ||
+	    CmdL.Parse(argc,argv) == false) {
+		_error->DumpErrors();
+		return 2;
+	}
+
+	// See if the help should be shown
+	if (_config->FindB("help") == true ||
+	    _config->FindB("version") == true) {
+		ShowHelp(CmdL);
+		return 1;
+	}
+
+	if (CmdL.FileList[0] != 0 && strcmp(CmdL.FileList[0], "scenario") == 0)
+	{
+		if (pkgInitSystem(*_config,_system) == false) {
+			std::cerr << "System could not be initialized!" << std::endl;
+			return 1;
+		}
+		pkgCacheFile CacheFile;
+		CacheFile.Open(NULL, false);
+		APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1);
+		FILE* output = stdout;
+		if (pkgset.empty() == true)
+			EDSP::WriteScenario(CacheFile, output);
+		else
+			EDSP::WriteLimitedScenario(CacheFile, output, pkgset);
+		fclose(output);
+		_error->DumpErrors(std::cerr);
+		return 0;
+	}
+
+	// Deal with stdout not being a tty
+	if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
+		_config->Set("quiet","1");
+
+	if (_config->FindI("quiet", 0) < 1)
+		_config->Set("Debug::EDSP::WriteSolution", true);
+
+	_config->Set("APT::Solver", "internal");
+	_config->Set("edsp::scenario", "stdin");
+	int input = STDIN_FILENO;
+	FILE* output = stdout;
+	SetNonBlock(input, false);
+
+	EDSP::WriteProgress(0, "Start up solver…", output);
+
+	if (pkgInitSystem(*_config,_system) == false) {
+		std::cerr << "System could not be initialized!" << std::endl;
+		return 1;
+	}
+
+	EDSP::WriteProgress(1, "Read request…", output);
+
+	if (WaitFd(input, false, 5) == false)
+		std::cerr << "WAIT timed out in the resolver" << std::endl;
+
+	std::list<std::string> install, remove;
+	bool upgrade, distUpgrade, autoRemove;
+	if (EDSP::ReadRequest(input, install, remove, upgrade, distUpgrade, autoRemove) == false) {
+		std::cerr << "Parsing the request failed!" << std::endl;
+		return 2;
+	}
+
+	EDSP::WriteProgress(5, "Read scenario…", output);
+
+	pkgCacheFile CacheFile;
+	CacheFile.Open(NULL, false);
+
+	EDSP::WriteProgress(50, "Apply request on scenario…", output);
+
+	if (EDSP::ApplyRequest(install, remove, CacheFile) == false) {
+		std::cerr << "Failed to apply request to depcache!" << std::endl;
+		return 3;
+	}
+
+	pkgProblemResolver Fix(CacheFile);
+	for (std::list<std::string>::const_iterator i = remove.begin();
+	     i != remove.end(); ++i) {
+		pkgCache::PkgIterator P = CacheFile->FindPkg(*i);
+		Fix.Clear(P);
+		Fix.Protect(P);
+		Fix.Remove(P);
+	}
+
+	for (std::list<std::string>::const_iterator i = install.begin();
+	     i != install.end(); ++i) {
+		pkgCache::PkgIterator P = CacheFile->FindPkg(*i);
+		Fix.Clear(P);
+		Fix.Protect(P);
+	}
+
+	for (std::list<std::string>::const_iterator i = install.begin();
+	     i != install.end(); ++i)
+		CacheFile->MarkInstall(CacheFile->FindPkg(*i), true);
+
+	EDSP::WriteProgress(60, "Call problemresolver on current scenario…", output);
+
+	if (upgrade == true) {
+		if (pkgAllUpgrade(CacheFile) == false) {
+			EDSP::WriteError("ERR_UNSOLVABLE_UPGRADE", "An upgrade error occured", output);
+			return 0;
+		}
+	} else if (distUpgrade == true) {
+		if (pkgDistUpgrade(CacheFile) == false) {
+			EDSP::WriteError("ERR_UNSOLVABLE_DIST_UPGRADE", "An dist-upgrade error occured", output);
+			return 0;
+		}
+	} else if (Fix.Resolve() == false) {
+		EDSP::WriteError("ERR_UNSOLVABLE", "An error occured", output);
+		return 0;
+	}
+
+	EDSP::WriteProgress(95, "Write solution…", output);
+
+	if (EDSP::WriteSolution(CacheFile, output) == false) {
+		std::cerr << "Failed to output the solution!" << std::endl;
+		return 4;
+	}
+
+	EDSP::WriteProgress(100, "Done", output);
+
+	bool const Errors = _error->PendingError();
+	if (_config->FindI("quiet",0) > 0)
+		_error->DumpErrors(std::cerr);
+	else
+		_error->DumpErrors(std::cerr, GlobalError::DEBUG);
+	return Errors == true ? 100 : 0;
+}
+									/*}}}*/
diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index b2c664979..2d5eed29d 100644
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -5,17 +5,26 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/init.h>
 #include <apt-pkg/strutl.h>
-
-#include <config.h>
-#include <apti18n.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/fileutl.h>
 
 #include <algorithm>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <fcntl.h>
+
+#include <apti18n.h>
 									/*}}}*/
 using namespace std;
 
@@ -32,14 +41,14 @@ bool DoAuto(CommandLine &CmdL)
    if (unlikely(Cache == NULL || DepCache == NULL))
       return false;
 
-   APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1);
+   APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1);
    if (pkgset.empty() == true)
       return _error->Error(_("No packages found"));
 
    bool MarkAuto = strcasecmp(CmdL.FileList[0],"auto") == 0;
    int AutoMarkChanged = 0;
 
-   for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
+   for (APT::PackageList::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
    {
       if (Pkg->CurrentVer == 0)
       {
@@ -79,7 +88,7 @@ bool DoMarkAuto(CommandLine &CmdL)
    if (unlikely(Cache == NULL || DepCache == NULL))
       return false;
 
-   APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1);
+   APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1);
    if (pkgset.empty() == true)
       return _error->Error(_("No packages found"));
 
@@ -87,7 +96,7 @@ bool DoMarkAuto(CommandLine &CmdL)
    bool const Verbose = _config->FindB("APT::MarkAuto::Verbose", false);
    int AutoMarkChanged = 0;
 
-   for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
+   for (APT::PackageList::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
    {
       if (Pkg->CurrentVer == 0 ||
 	  (((*DepCache)[Pkg].Flags & pkgCache::Flag::Auto) == pkgCache::Flag::Auto) == MarkAuto)
@@ -155,13 +164,63 @@ bool DoHold(CommandLine &CmdL)
    if (unlikely(Cache == NULL))
       return false;
 
-   APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1);
+   // Generate the base argument list for dpkg
+   std::vector<const char *> Args;
+   string Tmp = _config->Find("Dir::Bin::dpkg","dpkg");
+   {
+      string const dpkgChrootDir = _config->FindDir("DPkg::Chroot-Directory", "/");
+      size_t dpkgChrootLen = dpkgChrootDir.length();
+      if (dpkgChrootDir != "/" && Tmp.find(dpkgChrootDir) == 0)
+      {
+	 if (dpkgChrootDir[dpkgChrootLen - 1] == '/')
+	    --dpkgChrootLen;
+	 Tmp = Tmp.substr(dpkgChrootLen);
+      }
+   }
+   Args.push_back(Tmp.c_str());
+
+   // Stick in any custom dpkg options
+   Configuration::Item const *Opts = _config->Tree("DPkg::Options");
+   if (Opts != 0)
+   {
+      Opts = Opts->Child;
+      for (; Opts != 0; Opts = Opts->Next)
+      {
+	 if (Opts->Value.empty() == true)
+	    continue;
+	 Args.push_back(Opts->Value.c_str());
+      }
+   }
+
+   size_t const BaseArgs = Args.size();
+   // we need to detect if we can qualify packages with the architecture or not
+   Args.push_back("--assert-multi-arch");
+   Args.push_back(NULL);
+
+
+   pid_t dpkgAssertMultiArch = ExecFork();
+   if (dpkgAssertMultiArch == 0)
+   {
+      std::string const chrootDir = _config->FindDir("DPkg::Chroot-Directory");
+      if (chrootDir != "/" && chroot(chrootDir.c_str()) != 0)
+	 _error->WarningE("getArchitecture", "Couldn't chroot into %s for dpkg --assert-multi-arch", chrootDir.c_str());
+      // redirect everything to the ultimate sink as we only need the exit-status
+      int const nullfd = open("/dev/null", O_RDONLY);
+      dup2(nullfd, STDIN_FILENO);
+      dup2(nullfd, STDOUT_FILENO);
+      dup2(nullfd, STDERR_FILENO);
+      execvp(Args[0], (char**) &Args[0]);
+      _error->WarningE("dpkgGo", "Can't detect if dpkg supports multi-arch!");
+      _exit(2);
+   }
+
+   APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1);
    if (pkgset.empty() == true)
       return _error->Error(_("No packages found"));
 
    bool const MarkHold = strcasecmp(CmdL.FileList[0],"hold") == 0;
 
-   for (APT::PackageSet::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
+   for (APT::PackageList::iterator Pkg = pkgset.begin(); Pkg != pkgset.end();)
    {
       if ((Pkg->SelectedState == pkgCache::State::Hold) == MarkHold)
       {
@@ -169,9 +228,25 @@ bool DoHold(CommandLine &CmdL)
 	    ioprintf(c1out,_("%s was already set on hold.\n"), Pkg.FullName(true).c_str());
 	 else
 	    ioprintf(c1out,_("%s was already not hold.\n"), Pkg.FullName(true).c_str());
-	 pkgset.erase(Pkg);
-	 continue;
+	 Pkg = pkgset.erase(Pkg, true);
+      }
+      else
+	 ++Pkg;
+   }
+
+   bool dpkgMultiArch = false;
+   if (dpkgAssertMultiArch > 0)
+   {
+      int Status = 0;
+      while (waitpid(dpkgAssertMultiArch, &Status, 0) != dpkgAssertMultiArch)
+      {
+	 if (errno == EINTR)
+	    continue;
+	 _error->WarningE("dpkgGo", _("Waited for %s but it wasn't there"), "dpkg --assert-multi-arch");
+	 break;
       }
+      if (WIFEXITED(Status) == true && WEXITSTATUS(Status) == 0)
+	 dpkgMultiArch = true;
    }
 
    if (pkgset.empty() == true)
@@ -179,7 +254,7 @@ bool DoHold(CommandLine &CmdL)
 
    if (_config->FindB("APT::Mark::Simulate", false) == true)
    {
-      for (APT::PackageSet::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
+      for (APT::PackageList::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
       {
 	 if (MarkHold == false)
 	    ioprintf(c1out,_("%s set on hold.\n"), Pkg.FullName(true).c_str());
@@ -189,36 +264,60 @@ bool DoHold(CommandLine &CmdL)
       return true;
    }
 
-   string dpkgcall = _config->Find("Dir::Bin::dpkg", "dpkg");
-   std::vector<string> const dpkgoptions = _config->FindVector("DPkg::options");
-   for (std::vector<string>::const_iterator o = dpkgoptions.begin();
-	o != dpkgoptions.end(); ++o)
-      dpkgcall.append(" ").append(*o);
-   dpkgcall.append(" --set-selections");
-   FILE *dpkg = popen(dpkgcall.c_str(), "w");
-   if (dpkg == NULL)
-      return _error->Errno("DoHold", "fdopen on dpkg stdin failed");
-
-   for (APT::PackageSet::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
+   Args.erase(Args.begin() + BaseArgs, Args.end());
+   Args.push_back("--set-selections");
+   Args.push_back(NULL);
+
+   int external[2] = {-1, -1};
+   if (pipe(external) != 0)
+      return _error->WarningE("DoHold", "Can't create IPC pipe for dpkg --set-selections");
+
+   pid_t dpkgSelection = ExecFork();
+   if (dpkgSelection == 0)
+   {
+      close(external[1]);
+      std::string const chrootDir = _config->FindDir("DPkg::Chroot-Directory");
+      if (chrootDir != "/" && chroot(chrootDir.c_str()) != 0)
+	 _error->WarningE("getArchitecture", "Couldn't chroot into %s for dpkg --set-selections", chrootDir.c_str());
+      int const nullfd = open("/dev/null", O_RDONLY);
+      dup2(external[0], STDIN_FILENO);
+      dup2(nullfd, STDOUT_FILENO);
+      dup2(nullfd, STDERR_FILENO);
+      execvp(Args[0], (char**) &Args[0]);
+      _error->WarningE("dpkgGo", "Can't detect if dpkg supports multi-arch!");
+      _exit(2);
+   }
+
+   FILE* dpkg = fdopen(external[1], "w");
+   for (APT::PackageList::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
    {
       if (MarkHold == true)
       {
-	 fprintf(dpkg, "%s hold\n", Pkg.FullName(true).c_str());
+	 fprintf(dpkg, "%s hold\n", Pkg.FullName(!dpkgMultiArch).c_str());
 	 ioprintf(c1out,_("%s set on hold.\n"), Pkg.FullName(true).c_str());
       }
       else
       {
-	 fprintf(dpkg, "%s install\n", Pkg.FullName(true).c_str());
+	 fprintf(dpkg, "%s install\n", Pkg.FullName(!dpkgMultiArch).c_str());
 	 ioprintf(c1out,_("Canceled hold on %s.\n"), Pkg.FullName(true).c_str());
       }
    }
+   fclose(dpkg);
 
-   int const status = pclose(dpkg);
-   if (status == -1)
-      return _error->Errno("DoHold", "dpkg execution failed in the end");
-   if (WIFEXITED(status) == false || WEXITSTATUS(status) != 0)
-      return _error->Error(_("Executing dpkg failed. Are you root?"));
-   return true;
+   if (dpkgSelection > 0)
+   {
+      int Status = 0;
+      while (waitpid(dpkgSelection, &Status, 0) != dpkgSelection)
+      {
+	 if (errno == EINTR)
+	    continue;
+	 _error->WarningE("dpkgGo", _("Waited for %s but it wasn't there"), "dpkg --set-selection");
+	 break;
+      }
+      if (WIFEXITED(Status) == true && WEXITSTATUS(Status) == 0)
+	 return true;
+   }
+   return _error->Error(_("Executing dpkg failed. Are you root?"));
 }
 									/*}}}*/
 /* ShowHold - show packages set on hold in dpkg status			{{{*/
@@ -261,7 +360,7 @@ bool ShowHold(CommandLine &CmdL)
 /* */
 bool ShowHelp(CommandLine &CmdL)
 {
-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
 	    COMMON_ARCH,__DATE__,__TIME__);
 
    cout <<
diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc
index f95a434cc..46989044e 100644
--- a/cmdline/apt-sortpkgs.cc
+++ b/cmdline/apt-sortpkgs.cc
@@ -12,21 +12,24 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/init.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/pkgsystem.h>
 
-#include <config.h>
-#include <apti18n.h>
-    
 #include <vector>
 #include <algorithm>
 
 #include <locale.h>
 #include <unistd.h>
+
+#include <apti18n.h>
 									/*}}}*/
 
 using namespace std;
@@ -141,7 +144,7 @@ bool DoIt(string InFile)
 /* */
 int ShowHelp()
 {
-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
 	    COMMON_ARCH,__DATE__,__TIME__);
    if (_config->FindB("version") == true)
       return 0;
diff --git a/cmdline/makefile b/cmdline/makefile
index e867dae73..f3712232a 100644
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -33,20 +33,6 @@ LIB_MAKES = apt-pkg/makefile
 SOURCE = apt-cdrom.cc 
 include $(PROGRAM_H)
 
-# The apt-sortpkgs program
-PROGRAM=apt-sortpkgs
-SLIBS = -lapt-pkg $(INTLLIBS)
-LIB_MAKES = apt-pkg/makefile
-SOURCE = apt-sortpkgs.cc
-include $(PROGRAM_H)
-
-# The apt-extracttemplates program
-PROGRAM=apt-extracttemplates
-SLIBS = -lapt-pkg -lapt-inst $(INTLLIBS)
-LIB_MAKES = apt-pkg/makefile
-SOURCE = apt-extracttemplates.cc 
-include $(PROGRAM_H)
-
 # The apt-key program
 SOURCE=apt-key
 TO=$(BIN)
@@ -65,3 +51,36 @@ include $(PROGRAM_H)
 #TO=$(BIN)
 #TARGET=program
 #include $(COPY_H)
+
+#
+# the following programs are shipped in apt-utils
+#
+APT_DOMAIN:=apt-utils
+
+# The apt-sortpkgs program
+PROGRAM=apt-sortpkgs
+SLIBS = -lapt-pkg $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = apt-sortpkgs.cc
+include $(PROGRAM_H)
+
+# The apt-extracttemplates program
+PROGRAM=apt-extracttemplates
+SLIBS = -lapt-pkg -lapt-inst $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = apt-extracttemplates.cc 
+include $(PROGRAM_H)
+
+# The internal solver acting as an external
+PROGRAM=apt-internal-solver
+SLIBS = -lapt-pkg $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = apt-internal-solver.cc
+include $(PROGRAM_H)
+
+# This just dumps out the state
+PROGRAM=apt-dump-solver
+SLIBS = -lapt-pkg $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = apt-dump-solver.cc
+include $(PROGRAM_H)
diff --git a/configure.in b/configure.in
index b2880c99c..ecc0cecce 100644
--- a/configure.in
+++ b/configure.in
@@ -17,11 +17,12 @@ AC_INIT(configure.in)
 AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
-dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.8.2")
 PACKAGE="apt"
+PACKAGE_VERSION="0.9.0"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
+AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
 AC_SUBST(PACKAGE)
+AC_SUBST(PACKAGE_VERSION)
 
 dnl Check the archs, we want the target type.
 AC_CANONICAL_SYSTEM
@@ -31,6 +32,10 @@ AC_CHECK_TOOL_PREFIX
 AC_PROG_CC
 AC_ISC_POSIX
 
+dnl check for large file support and enable it if possible
+dnl do this early as other stuff might depend on it
+AC_SYS_LARGEFILE
+
 dnl Check for other programs
 AC_PROG_CXX
 AC_PROG_CPP
@@ -83,9 +88,21 @@ AC_CHECK_LIB(curl, curl_easy_init,
 
 AC_SUBST(BDBLIB)
 
+HAVE_ZLIB=no
 AC_CHECK_LIB(z, gzopen,
-	[AC_CHECK_HEADER(zlib.h, [], AC_MSG_ERROR([failed: zlib.h not found]))],
+	[AC_CHECK_HEADER(zlib.h, [HAVE_ZLIB=yes], AC_MSG_ERROR([failed: zlib.h not found]))],
 	AC_MSG_ERROR([failed: Need libz]))
+AC_SUBST(HAVE_ZLIB)
+if test "x$HAVE_ZLIB" = "xyes"; then
+	AC_DEFINE(HAVE_ZLIB)
+fi
+
+HAVE_BZ2=no
+AC_CHECK_LIB(bz2, BZ2_bzopen,[AC_CHECK_HEADER(bzlib.h, [HAVE_BZ2=yes], [])], [])
+AC_SUBST(HAVE_BZ2)
+if test "x$HAVE_BZ2" = "xyes"; then
+	AC_DEFINE(HAVE_BZ2)
+fi
 
 dnl Converts the ARCH to be something singular for this general CPU family
 dnl This is often the dpkg architecture string.
@@ -151,7 +168,7 @@ if test "$cross_compiling" = "yes" -a "x$archline" = "x"; then
   AC_MSG_ERROR(When cross compiling, architecture must be present in sizetable)
 fi
 AC_C_BIGENDIAN
-   
+
 dnl We do not need this if we have inttypes!
 HAVE_C9X=yes
 if test x"$apt_cv_c9x_ints" = x"no"; then
@@ -214,4 +231,4 @@ fi
 AC_SUBST(USE_NLS)
 AC_PATH_PROG(BASH, bash)
 
-AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile,make -s dirs)
+AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile:doc/Doxyfile.in,make -s dirs)
diff --git a/debian/apt-doc.docs b/debian/apt-doc.docs
index 86aa69ceb..4ec23f55d 100644
--- a/debian/apt-doc.docs
+++ b/debian/apt-doc.docs
@@ -1,2 +1,3 @@
 README.progress-reporting
 README.MultiArch
+doc/external-dependency-solver-protocol.txt
diff --git a/debian/apt-utils.dirs b/debian/apt-utils.dirs
index 14f5b95d7..681e55192 100644
--- a/debian/apt-utils.dirs
+++ b/debian/apt-utils.dirs
@@ -1,2 +1,2 @@
-usr/lib
+usr/lib/apt/solvers
 usr/bin
diff --git a/debian/apt-utils.install b/debian/apt-utils.install
index d947f26d4..cdbcb2f37 100644
--- a/debian/apt-utils.install
+++ b/debian/apt-utils.install
@@ -1 +1 @@
-bin/libapt-inst*.so.* usr/lib/
+usr/share/locale/*/*/apt-utils.mo
diff --git a/debian/apt-utils.links b/debian/apt-utils.links
new file mode 100644
index 000000000..5bf138c4a
--- /dev/null
+++ b/debian/apt-utils.links
@@ -0,0 +1 @@
+usr/bin/apt-internal-solver usr/lib/apt/solvers/apt
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 69f97a36b..6f6dc92a4 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -8,7 +8,7 @@
 #  Dir "/";
 #  - RootDir for all configuration files
 #
-#  Dir::Cache "var/apt/cache/";
+#  Dir::Cache "var/cache/apt/";
 #  - Set apt package cache directory
 #
 #  Dir::Cache::Archives "archives/";
diff --git a/debian/apt.dirs b/debian/apt.dirs
index 2770d79bb..f9c0b6c3e 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -1,5 +1,6 @@
 usr/bin
 usr/lib/apt/methods
+usr/lib/apt/solvers
 usr/lib/dpkg/methods/apt
 etc/apt
 etc/apt/apt.conf.d
diff --git a/debian/apt.install b/debian/apt.install
index 979e04ce2..9d4008fab 100644
--- a/debian/apt.install
+++ b/debian/apt.install
@@ -1,5 +1,4 @@
 bin/apt-* usr/bin/
-bin/libapt-pkg*.so.* usr/lib/
 bin/methods/* usr/lib/apt/methods/
 scripts/dselect/* usr/lib/dpkg/methods/apt/
-locale usr/share/
+usr/share/locale/*/*/apt.mo
diff --git a/debian/changelog b/debian/changelog
index 870578068..7cfa37e52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,512 @@
+apt (0.9.0) unstable; urgency=low
+
+  * upload to debian/unstable
+
+ -- Michael Vogt <mvo@debian.org>  Mon, 16 Apr 2012 15:53:17 +0200
+
+apt (0.9.0~exp1) experimental; urgency=low
+
+  [ Michael Vogt ]
+  * apt-pkg/packagemanager.cc:
+    - fix inconsistent clog/cout usage in the debug output
+    - add APT::pkgPackageManager::MaxLoopCount to ensure that the
+      ordering code does not get into a endless loop when it flip-flops
+      between two states
+  * update libapt-inst1.4 to libapt-inst1.5 because of the cleanup 
+    performed
+  * prepare debian/unstable upload, if there are no issues with this
+    upload it will directly go into unstable as 0.9.0  
+
+  [ David Kalnischkies ]
+  * do not update po and pot files in the process of the build as this
+    causes timestamp changes for the mo files which therefore can't
+    be refcounted by dpkg for your M-A: same packages
+    (Closes: #659333, LP: #924628)
+  * apt-inst/database.{cc,h}, apt-inst/deb/dpkgdb.{cc,h}:
+    - drop instead of fix as it is only needed if you want to reimplement dpkg
+      and comes straight from the beginning of last decade (Closes: #663372)
+  * apt-inst/deb/debfile.cc:
+    - {Extract,Merge}Control() is another instance of "lets reimplement dpkg"
+      so shot of this code before someone ends up using this…
+  * debian/libapt-pkg4.12:
+    - update symbols file
+  * debian/apt-utils.install:
+    - ship the ftparchive, apt-extractemplates and apt-sortpkgs locales
+      in the apt-utils package instead of the apt package
+  * apt-pkg/packagemanager.cc:
+    - recheck all dependencies if we changed a package in SmartConfigure
+      as this could break an earlier dependency (LP: #940396)
+    - recheck dependencies in SmartUnpack after a change, too
+  * apt-pkg/acquire-worker.cc:
+    - check return of write() as gcc recommends
+  * apt-pkg/acquire.cc:
+    - check return of write() as gcc recommends
+  * apt-pkg/cdrom.cc:
+    - check return of chdir() and link() as gcc recommends
+  * apt-pkg/clean.cc:
+    - check return of chdir() as gcc recommends
+  * apt-pkg/contrib/netrc.cc:
+    - check return of asprintf() as gcc recommends
+  * methods/rred.cc:
+    - check return of writev() as gcc recommends
+  * methods/mirror.cc:
+    - check return of chdir() as gcc recommends
+  * apt-pkg/deb/dpkgpm.cc:
+    - check return of write() a gcc recommends
+  * apt-inst/deb/debfile.cc:
+    - check return of chdir() as gcc recommends
+  * apt-inst/deb/dpkgdb.cc:
+    - check return of chdir() as gcc recommends
+  * methods/makefile:
+    - do not link rred against libz anymore as FileFd handles all
+      this transparently now
+  * debian/control:
+    - bump Standards-Version to 3.9.3 (no changes needed)
+    - add libbz2-dev as new build-dependency
+    - remove the libz-dev alternative from zlib1g-dev build-dependency
+    - suggest xz-utils instead of bzip2 and lzma
+  * doc/apt-get.8.xml:
+    - typofix: respect → respecting, thanks Mike Erickson! (Closes: #664833)
+  * debian/rules:
+    - do not sed in configure.in to set the version-number
+  * prepare-release:
+    - add as a small script to lazy check and prepare releases
+  * doc/*:
+    - move the command synopsis out of each manpage into apt-verbatim.ent
+      as they are a hell to translate and just single out the parameters
+      which can be translated to apt.ent
+  * apt-pkg/aptconfiguration.cc:
+    - if present, prefer xz binary over lzma
+    - if we have zlib builtin insert add a dummy gzip compressor for FileFD
+    - do the same for bz2 builtin if available
+  * methods/bzip2.cc:
+    - remove it as the functionality for all compressors can be
+      provided by gzip.cc now with the usage of FileFD
+  * apt-pkg/contrib/fileutl.cc:
+    - use libz2 library for (de)compression instead of the bzip2 binary as
+      the first is a dependency of dpkg and the later just priority:optional
+      so we gain 'easier' access to bz2-compressed Translation files this way
+  * cmdline/apt-get.cc:
+    - print list of autoremoves in alphabetical order (Closes: #639008)
+
+  [ Bogdan Purcareata ]
+  * doc/apt-get.8.xml:
+    - add 'download' to the usage line (Closes: #649340)
+  * cmdline/apt-get.cc:
+    - distinguish information about 'apt-get autoremove' based on the
+      number of auto-removed packages both before and after the list
+      of packages (Closes: #665833)
+
+  [ Steve Langasek ]
+  * don't treat build-depends-indep as cross-build-dependencies; we should
+    always install the host arch versions.  LP: #968828.
+
+  [ Paolo Rotolo ]
+  * Fix string from automatic to automatically (LP: #967393).
+
+ -- Michael Vogt <mvo@debian.org>  Thu, 12 Apr 2012 12:40:39 +0200
+
+apt (0.8.16~exp13) experimental; urgency=low
+
+  [ David Kalnischkies ]
+  * apt-pkg/acquire-item.cc:
+    - remove 'old' InRelease file if we can't get a new one before
+      proceeding with Release.gpg to avoid the false impression of a still
+      trusted repository by a (still present) old InRelease file.
+      Thanks to Simon Ruderich for reporting this issue! (CVE-2012-0214)
+    - add Debug::pkgAcqArchive::NoQueue to disable package downloading
+  * apt-pkg/deb/dpkgpm.cc:
+    - chroot if needed before dpkg --assert-multi-arch
+    - ensure that dpkg binary doesn't have the chroot-directory prefixed
+    - call dpkg --assert-multi-arch with execvp instead of execv
+    - save the universe by not printing messages about apport if a package
+      with this name is not installed (Closes: #619646)
+    - handle a SIGINT in all modes as a break after the currently running
+      dpkg transaction instead of ignoring it completely
+  * apt-pkg/depcache.cc:
+    - if a M-A:same package is marked for reinstall, mark all it's installed
+      silbings for reinstallation as well (LP: #859188)
+  * apt-pkg/contrib/configuration.cc:
+    - do not stop parent transversal in FindDir if the value is empty
+  * methods/http{s,}.cc:
+    - if a file without an extension is requested send an 'Accept: text/*'
+      header to avoid that the server chooses unsupported compressed files
+      in a content-negotation attempt (Closes: #657560)
+    - remove the arbitrary MAXLEN limit for response lines (Closes: #658346)
+  * apt-pkg/aptconfiguration.cc:
+    - chroot if needed before calling dpkg --print-foreign-architectures
+    - ensure that architectures are not added multiple times
+  * cmdline/apt-mark.cc:
+    - detect if dpkg has multiarch support before calling --set-selections
+    - correctly ignore already (un)hold packages
+  * apt-pkg/cachefile.cc:
+    - clean up lost atomic cachefiles with 'clean' (Closes: #650513)
+  * apt-pkg/indexrecords.cc:
+    - do not create empty Entries as a sideeffect of Lookup()
+  * apt-pkg/acquire-item.cc:
+    - drop support for i18n/Index file (introduced in 0.8.11) and use
+      the Release file instead to get the Translations (Closes: #649314)
+    - use pdiff for Translation-* files if available (Closes: #657902)
+  * ftparchive/writer.cc:
+    - add 'Translation-*' to the default patterns
+  * cmdline/apt-get.cc:
+    - if a package can't be removed as it is not installed, suggest to
+      the user an (installed) multiarch silbing with 'Did you mean?'
+    - improve 'error' message for packages which are only referenced
+      e.g. in a Depends line and are now requested for removal
+  * cmdline/apt-cache.cc:
+    - correct --pre-depends option by using dash consistently (LP: #940837)
+  * apt-pkg/packagemanager.cc:
+    - do not try to a void a breaks if the broken package pre-depends
+      on the breaker, but let dpkg auto-deconfigure it
+  * apt-pkg/contrib/fileutl.cc:
+    - do not warn about the ignoring of directories (Closes: #662762)
+
+  [ Steve Langasek ]
+  * cmdline/apt-get.cc:
+    - for cross-build-dependencies M-A: none should be DEB_HOST_ARCH,
+      not DEB_BUILD_ARCH (Closes: #646288)
+
+  [ Colin Watson ]
+  * apt-pkg/algorithms.cc:
+    - don't break out of the main-resolver loop for Breaks to deal with all
+      of them in a single iteration (Closes: #657695, LP: #922485)
+    - use a signed int instead of short for score calculation as upgrades
+      become so big now that it can overflow (Closes: #657732, LP: #917173)
+  * Fix IndexCopy::CopyPackages and TranslationsCopy::CopyTranslations to
+    handle compressed files again (LP: #924182, closes: #658096)
+
+  [ Michael Vogt ]
+  * apt-pkg/deb/dpkgpm.cc:
+    - fix crash when a package is in removed but residual config state
+      (LP: #923807)
+  * apt-pkg/contrib/fileutl.h:
+    - fix compat with FileFd::OpenDescriptor() in ReadOnlyGzip mode
+  * apt-pkg/packagemanager.cc:
+    - fix bug in predepends handling - ensure that packages that needs
+      unpackaging are unpacked before they are configured (LP: #927993)
+
+  [ Julian Andres Klode ]
+  * apt-pkg/deb/deblistparser.cc:
+    - Set the Essential flag on APT instead of only Important
+  * apt-pkg/packagemanager.cc:
+    - Do not use immediate configuration for packages with the Important flag
+  * Treat the Important flag like the Essential flag with those differences:
+    - No Immediate configuration (see above)
+    - Not automatically installed during dist-upgrade
+    - No higher score for installation ordering
+
+ -- Michael Vogt <mvo@debian.org>  Tue, 06 Mar 2012 18:12:57 +0100
+
+apt (0.8.16~exp12) experimental; urgency=low
+
+  [ Michael Vogt ]
+  * apt-pkg/deb/dpkgpm.cc:
+    - fix segfault on pkg removal
+
+  [ David Kalnischkies ]
+  * apt-pkg/cacheiterators.h:
+    - return the correct version arch for all+foreign, too
+  * apt-pkg/packagemanager.cc:
+    - ignore breaks on not-installed versions while searching for
+      breakage loops as we don't have to avoid them
+  * debian/control:
+    - remove APT from the short descriptions as lintian doesn't like it
+      and it doesn't transport any information for a reader anyway
+    - apply typofixes by Pascal De Vuyst, thanks! (Closes: #652834, #652835)
+  * debian/rules:
+    - apply patch to enable usage of hardning CPPFLAGS and LDFLAGS by
+      Moritz Muehlenhoff, thanks! (Closes: #653504)
+  * methods/https.cc:
+    - use curls list append instead of appending Range and If-Range by hand
+      which generates malformed requests, thanks Mel Collins for the hint!
+      (Closes: #646381)
+  * test/libapt/run-tests:
+    - hurd doesn't have dmesg yet and we don't really need it either,
+      so use with $0 a more stable data source for hashsumming
+
+  [ Pino Toscano ]
+  * test/libapt/globalerror_test.cc:
+    - errno 0 has a different strerror on hurd, so generate the expected
+      message dynamically instead of hardcoding 'Success' (Closes: #656530)
+
+ -- Michael Vogt <mvo@debian.org>  Tue, 24 Jan 2012 12:24:38 +0100
+
+apt (0.8.16~exp11) experimental; urgency=low
+
+  [ David Kalnischkies ]
+  * apt-pkg/deb/dpkgpm.cc:
+    - redirect out/input of dpkg --assert-multi-arch to /dev/null
+    - if multi-arch is detected ensure that pkg:all is reported as pkg:all
+
+ -- Michael Vogt <mvo@debian.org>  Thu, 19 Jan 2012 13:48:18 +0100
+
+apt (0.8.16~exp10) experimental; urgency=low
+
+  [ David Kalnischkies ]
+  * apt-pkg/depcache.cc:
+    - implicit conflicts (for multiarch) are supposed to conflict
+      only with real packages, not with virtual providers
+  * apt-pkg/pkgcache.cc:
+    - ignore implicit conflicts on providers in AllTarget, too
+  * apt-pkg/deb/dpkgpm.cc:
+    - check if dpkg supports multiarch with --assert-multi-arch
+      and if it does be always explicit about the architecture
+  * apt-pkg/contrib/fileutl.h:
+    - store the offset in the internal fd before calculate size of
+      the zlib-handled file to jump back to this place again
+  * apt-pkg/aptconfiguration.cc:
+    - parse dpkg --print-foreign-architectures correctly in
+      case archs are separated by newline instead of space, too.
+      (Closes: #655590)
+
+  [ Michael Vogt ]
+  * apt-pkg/contrib/fileutl.h:
+    - fix segfault triggered by the python-apt testsuite
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 18 Jan 2012 12:52:26 +0100
+
+apt (0.8.16~exp9) experimental; urgency=low
+
+  [ Julian Andres Klode ]
+  * apt-pkg/cdrom.cc:
+    - Accept .bz2, .xz files in addition to .gz files (Closes: #649451)
+
+  [ Michael Vogt ]
+  * apt-pkg/cdrom.cc:
+    - use aptconfiguration to get the supported compression types
+  * debian/control:
+    - bump debhelper build-dep to debhelper (>= 8.1.3~)
+    - set libapt-pkg-dev to multi-arch: same too
+  * g++ 4.7 fixes
+
+  [ Colin Watson ]
+  * Convert libapt-pkg4.12 and libapt-inst1.4 to Multi-Arch: same.
+
+  [ David Kalnischkies ]
+  * apt-pkg/cacheset.cc:
+    - make the cachesets real containers which can embedding any container
+      to be able to use the same interface regardless of set or list usage
+    - provide a {Package,Version}List similar to {Package,Version}Set
+  * cmdline/apt-{get,cache,mark}.cc:
+    - use Lists instead of Sets if input order should be preserved for
+      commands accepting lists of packages, e.g. policy (Closes: #625960)
+  * apt-pkg/depcache.cc:
+    - prefer native providers over foreigns even if the chain is foreign
+  * cmdline/apt-get.cc:
+    - ignore foreign architectures if we check if a provides has only one
+      resolver as it's basically the same for the user, so no need to choose
+  * cmdline/apt-config.cc:
+    - dump the APT::Compressor settings correctly and completely
+  * apt-pkg/contrib/fileutl.{h,cc}:
+    - implement a ModificationTime method for FileFd
+    - add a ReadLine method
+    - drop the explicit export of gz-compression handling
+  * apt-pkg/cdrom.cc:
+    - support InRelease files on cdrom
+
+ -- Michael Vogt <mvo@debian.org>  Thu, 05 Jan 2012 20:26:31 +0100
+
+apt (0.8.16~exp8) experimental; urgency=low
+
+  [ David Kalnischkies ]
+  * algorithms.cc:
+    - show a debug why a package was kept by ResolveByKeep()
+  * apt-pkg/packagemanager.cc:
+    - do not fail on unpacked packages in SmartUnPack, just don't
+      shedule them for unpack, but do all checks and configure them
+    - do not enter an endless loop for (essential) pre-dependency loops
+  * apt-pkg/contrib/sha2_internal.cc:
+    - use a pointer-union to peace gcc strict-aliasing warning
+  * apt-pkg/deb/deblistparser.cc:
+    - M-A: foreign packages provide for other archs, too
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 03 Nov 2011 09:40:29 -0500
+
+apt (0.8.16~exp7) experimental; urgency=low
+
+  [ David Kalnischkies ]
+  * do not pollute namespace in the headers with using (Closes: #500198)
+  * use forward declaration in headers if possible instead of includes
+  * remove old APT_COMPATIBILITY ifdef's
+  * apt-pkg/deb/dpkgpm.cc:
+    - use std::vector instead of fixed size arrays to store args and
+      multiarch-packagename strings
+    - load the dpkg base arguments only one time and reuse them later
+  * cmdline/apt-get.cc:
+    - follow Provides in the evaluation of saving candidates, too, for
+      statisfying garbage package dependencies (Closes: #640590)
+  * apt-pkg/algorithms.cc:
+    - if a package is garbage, don't try to save it with FixByInstall
+  * apt-pkg/deb/debsrcrecords.cc:
+    - remove the limit of 400 Binaries for a source package (Closes: #622110)
+  * apt-pkg/deb/deblistparser.cc:
+    - fix crash when the dynamic mmap needs to be grown in
+      LoadReleaseInfo (LP: #854090)
+  * apt-pkg/deb/debmetaindex.cc:
+    - none is a separator, not a language: no need for Index (Closes: #624218)
+  * apt-pkg/aptconfiguration.cc:
+    - do not builtin languages only if none is forced (Closes: #643787)
+  * apt-pkg/pkgcachegen.cc:
+    - refactor MergeList by creating -Group, -Package and -Version specialist
+    - share description list between "same" versions (LP: #868977)
+      This also means that descriptions are shared across archives now.
+    - add implicit dependencies needed for Multi-Arch at the time a Version
+      struct is created and not at the end of the cache generation
+  * apt-pkg/pkgcache.cc:
+    - always prefer "en" over "" for "en"-language regardless of cache-order
+
+  [ Michael Vogt ]
+  * apt-pkg/contrib/configuration.cc:
+    - fix double delete (LP: #848907)
+    - ignore only the invalid regexp instead of all options
+  * apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc:
+    - fix fetching language information by adding OptionalSubIndexTarget
+  * methods/https.cc:
+    - cleanup broken downloads properly
+
+  [ Colin Watson ]
+  * ftparchive/cachedb.cc:
+    - fix buffersize in bytes2hex
+
+ -- Michael Vogt <mvo@debian.org>  Fri, 14 Oct 2011 13:51:35 +0200
+
+apt (0.8.16~exp6) experimental; urgency=low
+
+  [ Christopher Baines ]
+  * enable APT in unpack/configure ordering to handle loops as well
+    as tight dependencies between immediate packages better
+    enabling also the possibility to mark all packages as immediate
+    (at least Closes: #353290, #540227, #559733, #621836, #639290)
+
+  [ David Kalnischkies ]
+  * [abi-break] Support large files in the complete toolset. Indexes of this
+    size are pretty unlikely for now, but we need it for deb
+    packages which could become bigger than 4GB now (LP: #815895)
+  * merged the debian-sid branch
+  
+  [ Michael Vogt ]
+  * bump ABI version
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 14 Sep 2011 21:06:51 +0200
+
+apt (0.8.16~exp5) experimental; urgency=low
+
+  * merged the latest debian-sid fixes
+  * apt-pkg/makefile:
+    - install sha256.h compat header
+  * apt-pkg/pkgcachegen.{cc,h}:
+    - use ref-to-ptr semantic in NewDepends() to ensure that the   
+      libapt does not segfault if the cache is remapped in between
+      (LP: #812862)
+    - fix crash when P.Arch() was used but the cache got remapped
+  * apt-pkg/acquire-item.{cc,h}:
+    - do not check for a "Package" tag in optional index targets
+      like the translations index
+  * apt-pkg/acquire.cc:
+    - fix potential divide-by-zero
+  * methods/mirror.cc:
+    - include the architecture(s) in the query string as well so 
+      that the server can make better decisions
+
+ -- Michael Vogt <mvo@debian.org>  Mon, 15 Aug 2011 14:52:54 +0200
+
+apt (0.8.16~exp4) experimental; urgency=low
+
+  [ Julian Andres Klode ]
+  * apt-pkg/pkgcache.h:
+    - [ABI break] Add pkgCache::Header::CacheFileSize, storing the cache size
+  * apt-pkg/pkgcachegen.cc:
+    - Write the file size to the cache
+  * apt-pkg/pkgcache.cc:
+    - Check that cache is at least CacheFileSize bytes large (LP: #16467)
+  
+  [ Michael Vogt ]
+  * merged latest fixes from debian-sid
+  * apt-pkg/cdrom.{cc,h}:
+    - cleanup old ABI break avoidance hacks
+  * [ABI break] apt-pkg/acquire-item.{cc,h}:
+    - cleanup around OptionalIndexTarget and SubIndexTarget
+  * [ABI break] merged patch from Jonathan Thomas to have a new
+    RecordField() function in the pkgRecorder parser. Many thanks
+    Thomas
+  * [ABI break] merge patch from Jonathan Thomas to speed up the
+    depcache by caching the install-recommends and install-suggests
+    values
+  * apt-pkg/contrib/fileutl.{cc,h}:
+    - add GetModificationTime() helper
+  * apt-pkg/pkgcachegen.cc:
+    - regenerate the cache if the sources.list changes to ensure
+      that changes in the ordering there will be honored by apt
+  * apt-pkg/sourcelist.{cc,h}:
+    - add pkgSourceList::GetLastModifiedTime() helper
+
+ -- Michael Vogt <mvo@debian.org>  Thu, 28 Jul 2011 16:57:08 +0200
+
+apt (0.8.16~exp3) experimental; urgency=low
+
+  [ David Kalnischkies ]
+  * apt-pkg/pkgcache.h:
+    - readd All{Foreign,Allowed} as suggested by Julian to
+      remain strictly API compatible
+  * apt-pkg/acquire*.{cc,h}:
+    - try even harder to support really big files in the fetcher by
+      converting (hopefully) everything to 'long long' (Closes: #632271)
+  * ftparchive/writer.cc:
+    - generate all checksums in one run over the file for Release
+  * cmdline/apt-get.cc:
+    - add an --assume-no option for testing to say 'no' to everything
+  * apt-pkg/deb/debmetaindex.cc:
+    - add trusted=yes option to mark unsigned (local) repository as trusted
+      based on a patch from Ansgar Burchardt, thanks a lot! (Closes: #596498)
+
+  [ Michael Vogt ]
+  * merge fixes from the debian/unstable upload
+  * merge lp:~mvo/apt/sha512-template to get fixes for the 
+    sha1/md5 verifiation (closes: #632520)
+
+ -- Michael Vogt <mvo@debian.org>  Fri, 15 Jul 2011 09:56:17 +0200
+
+apt (0.8.16~exp2) experimental; urgency=low
+
+  [ David Kalnischkies ]
+  * [ABI-Break] Implement EDSP in libapt-pkg so that all front-ends which
+    use the internal resolver can now be used also with external
+    ones as the usage is hidden in between the old API
+  * provide two edsp solvers in apt-utils:
+    - 'dump' to quickly output a complete scenario and
+    - 'apt' to use the internal as an external resolver
+  * apt-pkg/pkgcache.h:
+    - clean up mess with the "all" handling in MultiArch to
+      fix LP: #733741 cleanly for everyone now
+  * apt-pkg/depcache.cc:
+    - use a boolean instead of an int for Add/Remove in AddStates
+      similar to how it works with AddSizes
+    - let the Mark methods return if their marking was successful
+    - if a Breaks can't be upgraded, remove it. If it or a Conflict
+      can't be removed the installation of the breaker fails.
+  * cmdline/apt-get.cc:
+    - do not discard the error messages from the resolver and instead
+      only show the general 'Broken packages' message if nothing else
+
+  [ Stefano Zacchiroli ]
+  * doc/external-dependency-solver-protocol.txt:
+    - describe EDSP and the configuration interface around it
+  
+  [ Michael Vogt ]
+  * [ABI-Break] merge lp:~mvo/apt/sha512-template to add support for sha512
+  * [ABI-Break] merge lp:~mvo/apt/dpointer to support easier extending
+    without breaking the ABI
+  * increase ABI version and update package names
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 29 Jun 2011 13:57:28 +0200
+
+apt (0.8.16~exp1) experimental; urgency=low
+
+  * merged with the debian/unstable upload
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 29 Jun 2011 12:40:31 +0200
+
 apt (0.8.15.11) UNRELEASED; urgency=low
 
   * Fix typo in apt-get(8). Closes: #664833
@@ -36,9 +545,9 @@ apt (0.8.15.10) unstable; urgency=high
   * Polish (Michał Kułach). Closes: #656908
   * Danish (Joe Hansen). Closes: #658643
   * French: replace "étiquetage" by "épinglage" for "pinning"
-  
+
   [ Michael Vogt ]
-  * merged patch from lp:~uusijani/apt/uusi-branch: 
+  * merged patch from lp:~uusijani/apt/uusi-branch:
      Correct fi translation for hash sum mismatches (lp:420403)
      Thanks to Jani Uusitalo
 
@@ -91,7 +600,7 @@ apt (0.8.15.8) unstable; urgency=low
   * cmdline/apt-get.cc:
     - output list of virtual package providers to c1out in -q=1
       instead of /dev/null to unbreak sbuild (LP: #816155)
-  
+
   [ Michael Vogt ]
   * apt-pkg/contrib/configuration.cc:
     - fix double delete (LP: #848907)
@@ -378,6 +887,185 @@ apt (0.8.15) unstable; urgency=low
 
  -- Michael Vogt <mvo@debian.org>  Tue, 28 Jun 2011 18:00:48 +0200
 
+apt (0.8.15~exp3) experimental; urgency=low
+
+  * debian/control:
+    - add Breaks: 0.8.15~exp3) for libapt-pkg4.10 and 
+     libapt-inst1.2 (thanks to Jonathan Nieder, closes: #630214)
+    - use depends for the ${shlibs:Depends} to make the breaks work
+
+ -- Michael Vogt <mvo@debian.org>  Fri, 17 Jun 2011 21:51:41 +0200
+
+apt (0.8.15~exp2) experimental; urgency=low
+
+  * debian/control:
+    - fix incorrect Replaces (closes: #630204) for libapt-inst1.2
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 15 Jun 2011 16:51:14 +0200
+
+apt (0.8.15~exp1) experimental; urgency=low
+
+  [ Julian Andres Klode ]
+  * apt-pkg/depcache.cc:
+    - Really release action groups only once (Closes: #622744)
+    - Make purge work again for config-files (LP: #244598) (Closes: #150831)
+  * apt-pkg/acquire-item.cc:
+    - Reject files known to be invalid (LP: #346386) (Closes: #627642)
+  * debian/apt.cron.daily:
+    - Check power after wait, patch by manuel-soto (LP: #705269)
+  * debian/control:
+    - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT
+      unpacked if a library is too old and thus break upgrades
+  * doc/apt-key.8.xml:
+    - Document apt-key net-update (LP: #192810)
+
+  [ Christian Perrier ]
+  * Galician translation update (Miguel Anxo Bouzada). Closes: #626505
+  * Italian translation update (Milo Casagrande). Closes: #627834
+  * German documentation translation update (Chris Leick). Closes: #629949
+
+  [ David Kalnischkies ]
+  * fix a bunch of cppcheck warnings/errors based on a patch by
+    Niels Thykier, thanks! (Closes: #622805)
+  * apt-pkg/depcache.cc:
+    - really include 'rc' packages in the delete count by fixing a
+      typo which exists since 1999 in the source… (LP: #761175)
+    - if critical or-group can't be satisfied, exit directly.
+  * apt-pkg/acquire-method.cc:
+    - write directly to stdout instead of creating the message in
+      memory first before writing to avoid hitting limits
+    - fix order of CurrentURI and UsedMirror in Status() and Log()
+  * apt-pkg/orderlist.cc:
+    - let VisitRProvides report if the calls were successful
+  * apt-pkg/deb/dpkgpm.cc:
+    - replace obsolete usleep with nanosleep
+  * debian/apt{,-utils}.symbols:
+    - update both experimental symbol-files to reflect 0.8.14 state
+  * debian/rules:
+    - remove unused embedded jquery by doxygen from libapt-pkg-doc
+  * cmdline/apt-mark.cc:
+    - reimplement apt-mark in c++
+    - provide a 'showmanual' command (Closes: #582791)
+    - provide a 'dpkg --set-selections' wrapper to set/release holds
+  * cmdline/apt-get.cc:
+    - deprecate mostly undocumented 'markauto' in favor of 'apt-mark'
+  * cmdline/apt-cache.cc:
+    - deprecate mostly undocumented 'showauto' in favor of 'apt-mark'
+  * apt-pkg/pkgcache.cc:
+    - really ignore :arch in FindPkg() in non-multiarch environment
+  * doc/po/de.po:
+    - undo the translation of the command 'dump' in manpage of apt-config
+      as report by Burghard Grossmann on debian-l10n-german, thanks!
+  * apt-pkg/deb/debmetaindex.cc:
+    - do not download TranslationIndex if no Translation-* will be
+      downloaded later on anyway (Closes: #624218)
+  * test/versions.lst:
+    - disable obscure version number tests with versions dpkg doesn't
+      allow any more as they don't start with a number
+  * apt-pkg/acquire-worker.cc:
+    - print filename in the unmatching size warning (Closes: #623137)
+  * apt-pkg/acquire-item.cc:
+    - apply fix for poorly worded 'locate file' error message from
+      Ben Finney, thanks! (Closes: #623171)
+  * methods/http.cc:
+    - add config option to ignore a closed stdin to be able to easily
+      use the method as a simple standalone downloader
+    - Location header in redirects should be absolute URI, but some
+      servers just send an absolute path so still deal with it properly
+    - dequote URL taken from Location in redirects as we will otherwise
+      quote an already quoted string in the request later (Closes: #602412)
+  * apt-pkg/contrib/netrc.cc:
+    - replace non-posix gnu-extension strdupa with strdup
+  * apt-pkg/packagemanager.cc:
+    - ensure for Multi-Arch:same packages that they are unpacked in
+      lock step even in immediate configuration (Closes: #618288)
+
+  [ Michael Vogt ]
+  * methods/mirror.cc:
+    - ignore lines starting with "#" in the mirror file
+    - ignore non http urls in the mirrors
+    - append the dist (e.g. sid, wheezy) as a query string when
+      asking for a suitable mirror 
+  * debian/control:
+    - add libapt-pkg4.10 and libapt-inst1.2 library packages
+
+ -- Michael Vogt <mvo@debian.org>  Fri, 10 Jun 2011 15:32:07 +0200
+
+apt (0.8.14.2) UNRELEASED; urgency=low
+
+  [ Julian Andres Klode ]
+  * apt-pkg/depcache.cc:
+    - Really release action groups only once (Closes: #622744)
+    - Make purge work again for config-files (LP: #244598) (Closes: #150831)
+  * debian/apt.cron.daily:
+    - Check power after wait, patch by manuel-soto (LP: #705269)
+  * debian/control:
+    - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT
+      unpacked if a library is too old and thus break upgrades
+  * doc/apt-key.8.xml:
+    - Document apt-key net-update (LP: #192810)
+
+  [ Christian Perrier ]
+  * Galician translation update (Miguel Anxo Bouzada). Closes: #626505
+
+  [ David Kalnischkies ]
+  * fix a bunch of cppcheck warnings/errors based on a patch by
+    Niels Thykier, thanks! (Closes: #622805)
+  * apt-pkg/depcache.cc:
+    - really include 'rc' packages in the delete count by fixing a
+      typo which exists since 1999 in the source… (LP: #761175)
+    - if critical or-group can't be satisfied, exit directly.
+  * apt-pkg/acquire-method.cc:
+    - write directly to stdout instead of creating the message in
+      memory first before writing to avoid hitting limits
+    - fix order of CurrentURI and UsedMirror in Status() and Log()
+  * apt-pkg/orderlist.cc:
+    - let VisitRProvides report if the calls were successful
+  * apt-pkg/deb/dpkgpm.cc:
+    - replace obsolete usleep with nanosleep
+  * debian/apt{,-utils}.symbols:
+    - update both experimental symbol-files to reflect 0.8.14 state
+  * debian/rules:
+    - remove unused embedded jquery by doxygen from libapt-pkg-doc
+  * cmdline/apt-mark.cc:
+    - reimplement apt-mark in c++
+    - provide a 'showmanual' command (Closes: #582791)
+    - provide a 'dpkg --set-selections' wrapper to set/release holds
+  * cmdline/apt-get.cc:
+    - deprecate mostly undocumented 'markauto' in favor of 'apt-mark'
+  * cmdline/apt-cache.cc:
+    - deprecate mostly undocumented 'showauto' in favor of 'apt-mark'
+  * apt-pkg/pkgcache.cc:
+    - really ignore :arch in FindPkg() in non-multiarch environment
+  * doc/po/de.po:
+    - undo the translation of the command 'dump' in manpage of apt-config
+      as report by Burghard Grossmann on debian-l10n-german, thanks!
+  * apt-pkg/deb/debmetaindex.cc:
+    - do not download TranslationIndex if no Translation-* will be
+      downloaded later on anyway (Closes: #624218)
+  * test/versions.lst:
+    - disable obscure version number tests with versions dpkg doesn't
+      allow any more as they don't start with a number
+  * apt-pkg/acquire-worker.cc:
+    - print filename in the unmatching size warning (Closes: #623137)
+  * apt-pkg/acquire-item.cc:
+    - apply fix for poorly worded 'locate file' error message from
+      Ben Finney, thanks! (Closes: #623171)
+  * methods/http.cc:
+    - add config option to ignore a closed stdin to be able to easily
+      use the method as a simple standalone downloader
+    - Location header in redirects should be absolute URI, but some
+      servers just send an absolute path so still deal with it properly
+    - dequote URL taken from Location in redirects as we will otherwise
+      quote an already quoted string in the request later (Closes: #602412)
+  * apt-pkg/contrib/netrc.cc:
+    - replace non-posix gnu-extension strdupa with strdup
+  * apt-pkg/packagemanager.cc:
+    - ensure for Multi-Arch:same packages that they are unpacked in
+      lock step even in immediate configuration (Closes: #618288)
+
+ -- Michael Vogt <mvo@debian.org>  Mon, 16 May 2011 14:57:52 +0200
+
 apt (0.8.14.1) unstable; urgency=low
 
   * apt-pkg/acquire-item.cc:
diff --git a/debian/control b/debian/control
index 6d0f16b70..fc9d3f405 100644
--- a/debian/control
+++ b/debian/control
@@ -5,43 +5,84 @@ Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
  Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
  Julian Andres Klode <jak@debian.org>
-Standards-Version: 3.9.2
-Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 7.2.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen
+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),
+ zlib1g-dev, libbz2-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml,
+ po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen
 Build-Conflicts: autoconf2.13, automake1.4
 Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
 Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/
 
 Package: apt
 Architecture: any
-Pre-Depends: ${shlibs:Depends}
-Depends: debian-archive-keyring, ${misc:Depends}, gnupg
+Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg
 Replaces: manpages-pl (<< 20060617-3~)
-Provides: ${libapt-pkg:provides}
 Conflicts: python-apt (<< 0.7.93.2~)
-Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
-Description: 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.
+Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, xz-utils, python-apt
+Description: commandline package manager
+ This package provides commandline tools for searching and
+ managing as well as querying information about packages
+ as a low-level access to all features of the libapt-pkg library.
  .
- APT features complete installation ordering, multiple source capability
- and several other unique features, see the Users Guide in apt-doc.
+ These include:
+  * apt-get for retrieval of packages and information about them
+    from authenticated sources and for installation, upgrade and
+    removal of packages together with their dependencies
+  * apt-cache for querying available information about installed
+    as well as installable packages
+  * apt-cdrom to use removable media as a source for packages
+  * apt-config as an interface to the configuration settings
+  * apt-key as an interface to manage authentication keys
+
+Package: libapt-pkg4.12
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: package managment runtime library
+ This library provides the common functionality for searching and
+ managing packages as well as information about packages.
+ Higher-level package managers can depend upon this library.
+ .
+ This includes:
+  * retrieval of information about packages from multiple sources
+  * retrieval of packages and all dependent packages
+    needed to satisfy a request either through an internal
+    solver or by interfacing with an external one
+  * authenticating the sources and validating the retrieved data
+  * installation and removal of packages in the system
+  * providing different transports to retrieve data over cdrom, ftp,
+    http, rsh as well as an interface to add more transports like
+    https (apt-transport-https) and debtorrent (apt-transport-debtorrent).
+
+Package: libapt-inst1.5
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: deb package format runtime library
+ This library provides methods to query and extract information
+ from deb packages. This includes the control data and the package
+ file content.
 
 Package: apt-doc
 Architecture: all
 Priority: optional
 Depends: ${misc:Depends}
 Section: doc
-Description: Documentation for APT
- This package contains the user guide and offline guide, for APT, an
- Advanced Package Tool.
+Description: documentation for APT
+ This package contains the user guide and offline guide for various
+ APT tools which are provided in a html and a text-only version.
 
 Package: libapt-pkg-dev
 Architecture: any
+Multi-Arch: same
 Priority: optional
-Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}, ${misc:Depends}, zlib1g-dev | zlib-dev
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${libapt-pkg-name} (= ${binary:Version}), ${libapt-inst-name} (= ${binary:Version}), ${misc:Depends}, zlib1g-dev
 Section: libdevel
-Description: Development files for APT's libapt-pkg and libapt-inst
+Description: development files for APT's libapt-pkg and libapt-inst
  This package contains the header files and libraries for
  developing with APT's libapt-pkg Debian package manipulation
  library and the libapt-inst deb/tar/ar library.
@@ -51,7 +92,7 @@ Architecture: all
 Priority: optional
 Depends: ${misc:Depends}
 Section: doc
-Description: Documentation for APT development
+Description: documentation for APT development
  This package contains documentation for development of the APT
  Debian package manipulation program and its libraries.
  .
@@ -61,19 +102,26 @@ Description: Documentation for APT development
 Package: apt-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: ${libapt-inst:provides}
-Description: APT utility programs
- This package contains some APT utility programs such as apt-ftparchive,
- apt-sortpkgs and apt-extracttemplates.
+Suggests: xz-utils
+Description: package managment related utility programs
+ This package contains some less used commandline utilities related
+ to package managment with APT.
  .
- apt-extracttemplates is used by debconf to prompt for configuration 
- questions before installation. apt-ftparchive is used to create Package
- and other index files. apt-sortpkgs is a Package/Source file normalizer.
+  * apt-extracttemplates is used by debconf to prompt for configuration
+    questions before installation.
+  * apt-ftparchive is used to create Packages and other index files
+    needed to publish an archive of debian packages
+  * apt-sortpkgs is a Packages/Sources file normalizer.
 
 Package: apt-transport-https
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Priority: optional
-Description: APT https transport
- This package contains a APT https transport. It makes it possible to
- use 'deb https://foo distro main' lines in the sources.list.
+Description: https download transport for APT
+ This package enables the usage of 'deb https://foo distro main' lines
+ in the /etc/apt/sources.list so that all package managers using the
+ libapt-pkg library can access metadata and packages available in sources
+ accessible over https (Hypertext Transfer Protocol Secure).
+ .
+ This transport supports server as well as client authentication
+ with certificates.
diff --git a/debian/libapt-inst1.5.install.in b/debian/libapt-inst1.5.install.in
new file mode 100644
index 000000000..8bcce2c28
--- /dev/null
+++ b/debian/libapt-inst1.5.install.in
@@ -0,0 +1,2 @@
+bin/libapt-inst*.so.* usr/lib/@DEB_HOST_MULTIARCH@/
+usr/share/locale/*/*/libapt-inst*.mo
diff --git a/debian/apt-utils.symbols b/debian/libapt-inst1.5.symbols
index 9ba283a51..cade0990d 100644
--- a/debian/apt-utils.symbols
+++ b/debian/libapt-inst1.5.symbols
@@ -1,5 +1,4 @@
-libapt-inst.so.1.2 libapt-inst1.2
-| apt-utils #MINVER#
+libapt-inst.so.1.4 libapt-inst1.4 #MINVER#
 * Build-Depends-Package: libapt-pkg-dev
  (c++)"ExtractTar::Done(bool)@Base" 0.8.0
  (c++)"ExtractTar::Go(pkgDirStream&)@Base" 0.8.0
@@ -8,11 +7,9 @@ libapt-inst.so.1.2 libapt-inst1.2
  (c++)"ExtractTar::~ExtractTar()@Base" 0.8.0
  (c++)"debDebFile::GotoMember(char const*)@Base" 0.8.0
  (c++)"debDebFile::CheckMember(char const*)@Base" 0.8.0
- (c++)"debDebFile::MergeControl(pkgDataBase&)@Base" 0.8.0
  (c++)"debDebFile::ControlExtract::DoItem(pkgDirStream::Item&, int&)@Base" 0.8.0
  (c++)"debDebFile::ControlExtract::~ControlExtract()@Base" 0.8.0
  (c++)"debDebFile::ExtractArchive(pkgDirStream&)@Base" 0.8.0
- (c++)"debDebFile::ExtractControl(pkgDataBase&)@Base" 0.8.0
  (c++)"debDebFile::MemControlExtract::TakeControl(void const*, unsigned long)@Base" 0.8.0
  (c++)"debDebFile::MemControlExtract::Read(debDebFile&)@Base" 0.8.0
  (c++)"debDebFile::MemControlExtract::DoItem(pkgDirStream::Item&, int&)@Base" 0.8.0
@@ -40,16 +37,11 @@ libapt-inst.so.1.2 libapt-inst1.2
  (c++)"pkgFLCache::HashNode(pkgFLCache::NodeIterator const&)@Base" 0.8.0
  (c++)"pkgFLCache::PrintTree(unsigned int, unsigned long)@Base" 0.8.0
  (c++)"pkgFLCache::pkgFLCache(DynamicMMap&)@Base" 0.8.0
- (c++)"pkgDataBase::GetMetaTmp(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 0.8.0
- (c++)"pkgDataBase::~pkgDataBase()@Base" 0.8.0
  (c++)"pkgDirStream::FinishedFile(pkgDirStream::Item&, int)@Base" 0.8.0
  (c++)"pkgDirStream::Fail(pkgDirStream::Item&, int)@Base" 0.8.0
  (c++)"pkgDirStream::DoItem(pkgDirStream::Item&, int&)@Base" 0.8.0
  (c++)"pkgDirStream::Process(pkgDirStream::Item&, unsigned char const*, unsigned long, unsigned long)@Base" 0.8.0
  (c++)"pkgDirStream::~pkgDirStream()@Base" 0.8.0
- (c++|optional)"debListParser::~debListParser()@Base" 0.8.0
- (c++|optional)"pkgCacheGenerator::ListParser::CollectFileProvides(pkgCache&, pkgCache::VerIterator&)@Base" 0.8.0
- (c++|optional)"pkgCacheGenerator::ListParser::~ListParser()@Base" 0.8.0
  (c++|optional)"pkgCache::DepIterator::operator++(int)@Base" 0.8.0
  (c++|optional)"pkgCache::DepIterator::operator++()@Base" 0.8.0
  (c++|optional)"pkgCache::VerIterator::operator++(int)@Base" 0.8.0
@@ -57,15 +49,6 @@ libapt-inst.so.1.2 libapt-inst1.2
  (c++)"ARArchive::LoadHeaders()@Base" 0.8.0
  (c++)"ARArchive::ARArchive(FileFd&)@Base" 0.8.0
  (c++)"ARArchive::~ARArchive()@Base" 0.8.0
- (c++)"debDpkgDB::InitMetaTmp(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 0.8.0
- (c++)"debDpkgDB::LoadChanges()@Base" 0.8.0
- (c++)"debDpkgDB::ReadConfFiles()@Base" 0.8.0
- (c++)"debDpkgDB::ReadyFileList(OpProgress&)@Base" 0.8.0
- (c++)"debDpkgDB::ReadyPkgCache(OpProgress&)@Base" 0.8.0
- (c++)"debDpkgDB::ReadDiversions()@Base" 0.8.0
- (c++)"debDpkgDB::ReadFList(OpProgress&)@Base" 0.8.0
- (c++)"debDpkgDB::debDpkgDB()@Base" 0.8.0
- (c++)"debDpkgDB::~debDpkgDB()@Base" 0.8.0
  (c++)"pkgFLCache::NodeIterator::RealPackage() const@Base" 0.8.0
  (c++)"pkgFLCache::Header::CheckSizes(pkgFLCache::Header&) const@Base" 0.8.0
  (c++|optional)"pkgCache::DepIterator::OwnerPointer() const@Base" 0.8.0
@@ -73,48 +56,36 @@ libapt-inst.so.1.2 libapt-inst1.2
  (c++)"ARArchive::FindMember(char const*) const@Base" 0.8.0
  (c++)"typeinfo for ExtractTar@Base" 0.8.0
  (c++)"typeinfo for pkgExtract@Base" 0.8.0
- (c++)"typeinfo for pkgDataBase@Base" 0.8.0
  (c++)"typeinfo for pkgDirStream@Base" 0.8.0
- (c++)"typeinfo for debDpkgDB@Base" 0.8.0
  (c++)"typeinfo for debDebFile::ControlExtract@Base" 0.8.0
  (c++)"typeinfo for debDebFile::MemControlExtract@Base" 0.8.0
- (c++|optional)"typeinfo for pkgCacheGenerator::ListParser@Base" 0.8.0
  (c++|optional)"typeinfo for pkgCache::DepIterator@Base" 0.8.0
  (c++|optional)"typeinfo for pkgCache::VerIterator@Base" 0.8.0
  (c++|optional)"typeinfo for pkgCache::Iterator<pkgCache::Dependency, pkgCache::DepIterator>@Base" 0.8.0
- (c++|optional)"typeinfo for pkgCache::Iterator<pkgCache::Package, pkgCache::PkgIterator>@Base" 0.8.0
  (c++|optional)"typeinfo for pkgCache::Iterator<pkgCache::Version, pkgCache::VerIterator>@Base" 0.8.0
  (c++)"typeinfo name for ExtractTar@Base" 0.8.0
  (c++)"typeinfo name for pkgExtract@Base" 0.8.0
- (c++)"typeinfo name for pkgDataBase@Base" 0.8.0
  (c++)"typeinfo name for pkgDirStream@Base" 0.8.0
- (c++)"typeinfo name for debDpkgDB@Base" 0.8.0
  (c++)"typeinfo name for debDebFile::ControlExtract@Base" 0.8.0
  (c++)"typeinfo name for debDebFile::MemControlExtract@Base" 0.8.0
- (c++|optional)"typeinfo name for pkgCacheGenerator::ListParser@Base" 0.8.0
  (c++|optional)"typeinfo name for pkgCache::DepIterator@Base" 0.8.0
  (c++|optional)"typeinfo name for pkgCache::VerIterator@Base" 0.8.0
  (c++|optional)"typeinfo name for pkgCache::Iterator<pkgCache::Dependency, pkgCache::DepIterator>@Base" 0.8.0
- (c++|optional)"typeinfo name for pkgCache::Iterator<pkgCache::Package, pkgCache::PkgIterator>@Base" 0.8.0
  (c++|optional)"typeinfo name for pkgCache::Iterator<pkgCache::Version, pkgCache::VerIterator>@Base" 0.8.0
  (c++)"vtable for ExtractTar@Base" 0.8.0
  (c++)"vtable for pkgExtract@Base" 0.8.0
- (c++)"vtable for pkgDataBase@Base" 0.8.0
  (c++)"vtable for pkgDirStream@Base" 0.8.0
- (c++)"vtable for debDpkgDB@Base" 0.8.0
  (c++)"vtable for debDebFile::ControlExtract@Base" 0.8.0
  (c++)"vtable for debDebFile::MemControlExtract@Base" 0.8.0
- (c++|optional)"vtable for pkgCacheGenerator::ListParser@Base" 0.8.0
  (c++|optional)"vtable for pkgCache::DepIterator@Base" 0.8.0
  (c++|optional)"vtable for pkgCache::VerIterator@Base" 0.8.0
  (c++|optional)"vtable for pkgCache::Iterator<pkgCache::Dependency, pkgCache::DepIterator>@Base" 0.8.0
- (c++|optional)"vtable for pkgCache::Iterator<pkgCache::Package, pkgCache::PkgIterator>@Base" 0.8.0
  (c++|optional)"vtable for pkgCache::Iterator<pkgCache::Version, pkgCache::VerIterator>@Base" 0.8.0
 ### gcc-4.4 specific
 # (c++|regex|optional=std)"^char\* std::[^ ]+<.+ >::_.+@Base$" 0.8.0
 # (c++|optional=std)"std::basic_string<char, std::char_traits<char>, std::allocator<char> >& std::basic_string<char, std::char_traits<char>, std::allocator<char> >::append<unsigned char*>(unsigned char*, unsigned char*)@Base" 0.8.0
 ### gcc-4.6 specific
- (c++|optional=std)"std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::~vector()@Base" 0.8.12 1
+ (c++|optional=std)"std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::~vector()@Base" 0.8.12
  (c++|optional=std)"std::basic_string<char, std::char_traits<char>, std::allocator<char> >& std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_replace_dispatch<unsigned char*>(__gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, __gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, unsigned char*, unsigned char*, std::__false_type)@Base" 0.8.0
 ### try to ignore std:: template instances
  (c++|regex|optional=std)"^std::basic_string<.+ >\(.+\)@Base$" 0.8.0
diff --git a/debian/libapt-pkg-dev.dirs b/debian/libapt-pkg-dev.dirs
deleted file mode 100644
index 844642ab0..000000000
--- a/debian/libapt-pkg-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/include/apt-pkg
diff --git a/debian/libapt-pkg-dev.install b/debian/libapt-pkg-dev.install
deleted file mode 100644
index bd1a6c174..000000000
--- a/debian/libapt-pkg-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/libapt-pkg*.so usr/lib/
-bin/libapt-inst*.so usr/lib/
-include/apt-pkg/*.h usr/include/apt-pkg/
diff --git a/debian/libapt-pkg-dev.install.in b/debian/libapt-pkg-dev.install.in
new file mode 100644
index 000000000..be8022107
--- /dev/null
+++ b/debian/libapt-pkg-dev.install.in
@@ -0,0 +1,3 @@
+bin/libapt-pkg*.so usr/lib/@DEB_HOST_MULTIARCH@/
+bin/libapt-inst*.so usr/lib/@DEB_HOST_MULTIARCH@/
+include/apt-pkg/*.h usr/include/apt-pkg/
diff --git a/debian/libapt-pkg4.12.install.in b/debian/libapt-pkg4.12.install.in
new file mode 100644
index 000000000..56bed39d3
--- /dev/null
+++ b/debian/libapt-pkg4.12.install.in
@@ -0,0 +1,2 @@
+bin/libapt-pkg*.so.* usr/lib/@DEB_HOST_MULTIARCH@/
+usr/share/locale/*/*/libapt-pkg*.mo
diff --git a/debian/apt.symbols b/debian/libapt-pkg4.12.symbols
index 11994afeb..1abf22899 100644
--- a/debian/apt.symbols
+++ b/debian/libapt-pkg4.12.symbols
@@ -1,5 +1,4 @@
-libapt-pkg.so.4.10 libapt-pkg4.10
-| apt #MINVER#
+libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER#
 * Build-Depends-Package: libapt-pkg-dev
  TFRewritePackageOrder@Base 0.8.0
  TFRewriteSourceOrder@Base 0.8.0
@@ -56,12 +55,10 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"pkgMinimizeUpgrade(pkgDepCache&)@Base" 0.8.0
  (c++)"GetListOfFilesInDir(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, bool const&)@Base" 0.8.0
  (c++)"GetListOfFilesInDir(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool const&, bool const&)@Base" 0.8.0
- (c++)"pkgMakeStatusCacheMem(pkgSourceList&, OpProgress&)@Base" 0.8.0
  (c++)"pkgMakeOnlyStatusCache(OpProgress&, DynamicMMap**)@Base" 0.8.0
  (c++)"WaitFd(int, bool, unsigned long)@Base" 0.8.0
  (c++)"GetLock(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, bool)@Base" 0.8.0
  (c++)"Hex2Num(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned char*, unsigned int)@Base" 0.8.0
- (c++)"AddCRC16(unsigned short, void const*, unsigned long)@Base" 0.8.0
  (c++)"CopyFile(FileFd&, FileFd&)@Base" 0.8.0
  (c++)"ExecFork()@Base" 0.8.0
  (c++)"ExecWait(int, char const*, bool)@Base" 0.8.0
@@ -98,25 +95,18 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"HashString::HashString()@Base" 0.8.0
  (c++)"HashString::~HashString()@Base" 0.8.0
  (c++)"OpProgress::CheckChange(float)@Base" 0.8.0
- (c++)"OpProgress::SubProgress(unsigned long)@Base" 0.8.0
- (c++)"OpProgress::SubProgress(unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
- (c++)"OpProgress::OverallProgress(unsigned long, unsigned long, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
  (c++)"OpProgress::Done()@Base" 0.8.0
  (c++)"OpProgress::Update()@Base" 0.8.0
- (c++)"OpProgress::Progress(unsigned long)@Base" 0.8.0
  (c++)"OpProgress::OpProgress()@Base" 0.8.0
  (c++)"OpProgress::~OpProgress()@Base" 0.8.0
  (c++)"SourceCopy::GetFileName()@Base" 0.8.0
  (c++)"SourceCopy::RewriteEntry(_IO_FILE*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
  (c++)"SourceCopy::Type()@Base" 0.8.0
- (c++)"SourceCopy::GetFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned long&)@Base" 0.8.0
  (c++)"SourceCopy::~SourceCopy()@Base" 0.8.0
  (c++)"pkgAcqFile::Custom600Headers()@Base" 0.8.0
- (c++)"pkgAcqFile::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
  (c++)"pkgAcqFile::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
  (c++)"pkgAcqFile::DescURI()@Base" 0.8.0
  (c++)"pkgAcqFile::HashSum()@Base" 0.8.0
- (c++)"pkgAcqFile::pkgAcqFile(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.8.0
  (c++)"pkgAcqFile::~pkgAcqFile()@Base" 0.8.0
  (c++)"pkgAcquire::WorkerStep(pkgAcquire::Worker*)@Base" 0.8.0
  (c++)"pkgAcquire::FetchNeeded()@Base" 0.8.0
@@ -129,8 +119,6 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"pkgAcquire::Bump()@Base" 0.8.0
  (c++)"pkgAcquire::Item::Custom600Headers()@Base" 0.8.0
  (c++)"pkgAcquire::Item::ReportMirrorFailure(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
- (c++)"pkgAcquire::Item::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
- (c++)"pkgAcquire::Item::Start(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long)@Base" 0.8.0
  (c++)"pkgAcquire::Item::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
  (c++)"pkgAcquire::Item::Rename(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
  (c++)"pkgAcquire::Item::HashSum()@Base" 0.8.0
@@ -200,10 +188,8 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"pkgRecords::pkgRecords(pkgCache&)@Base" 0.8.0
  (c++)"pkgRecords::~pkgRecords()@Base" 0.8.0
  (c++)"pkgTagFile::Fill()@Base" 0.8.0
- (c++)"pkgTagFile::Jump(pkgTagSection&, unsigned long)@Base" 0.8.0
  (c++)"pkgTagFile::Step(pkgTagSection&)@Base" 0.8.0
  (c++)"pkgTagFile::Resize()@Base" 0.8.0
- (c++)"pkgTagFile::pkgTagFile(FileFd*, unsigned long)@Base" 0.8.0
  (c++)"pkgTagFile::~pkgTagFile()@Base" 0.8.0
  (c++)"CdromDevice::~CdromDevice()@Base" 0.8.0
  (c++)"CommandLine::DispatchArg(CommandLine::Dispatch*, bool)@Base" 0.8.0
@@ -212,7 +198,6 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"CommandLine::HandleOpt(int&, int, char const**, char const*&, CommandLine::Args*, bool)@Base" 0.8.0
  (c++)"CommandLine::CommandLine(CommandLine::Args*, Configuration*)@Base" 0.8.0
  (c++)"CommandLine::~CommandLine()@Base" 0.8.0
- (c++)"DynamicMMap::RawAllocate(unsigned long, unsigned long)@Base" 0.8.0
  (c++)"DynamicMMap::WriteString(char const*, unsigned long)@Base" 0.8.0
  (c++)"DynamicMMap::Grow()@Base" 0.8.0
  (c++)"DynamicMMap::Allocate(unsigned long)@Base" 0.8.0
@@ -238,16 +223,11 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"GlobalError::Warning(char const*, ...)@Base" 0.8.0
  (c++)"GlobalError::WarningE(char const*, char const*, ...)@Base" 0.8.0
  (c++)"GlobalError::GlobalError()@Base" 0.8.0
- (c++)"MD5SumValue::Set(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
- (c++)"MD5SumValue::MD5SumValue(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
- (c++)"MD5SumValue::MD5SumValue()@Base" 0.8.0
  (c++)"PackageCopy::GetFileName()@Base" 0.8.0
  (c++)"PackageCopy::RewriteEntry(_IO_FILE*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
  (c++)"PackageCopy::Type()@Base" 0.8.0
- (c++)"PackageCopy::GetFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned long&)@Base" 0.8.0
  (c++)"PackageCopy::~PackageCopy()@Base" 0.8.0
  (c++)"pkgAcqIndex::Custom600Headers()@Base" 0.8.0
- (c++)"pkgAcqIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
  (c++)"pkgAcqIndex::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
  (c++)"pkgAcqIndex::DescURI()@Base" 0.8.0
  (c++)"pkgAcqIndex::HashSum()@Base" 0.8.0
@@ -286,12 +266,9 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"pkgDepCache::Update(pkgCache::DepIterator)@Base" 0.8.0
  (c++)"pkgDepCache::Update(OpProgress*)@Base" 0.8.0
  (c++)"pkgDepCache::Update(pkgCache::PkgIterator const&)@Base" 0.8.0
- (c++)"pkgDepCache::AddSizes(pkgCache::PkgIterator const&, bool const&)@Base" 0.8.0
- (c++)"pkgDepCache::AddSizes(pkgCache::PkgIterator const&, long)@Base" 0.8.0
  (c++)"pkgDepCache::CheckDep(pkgCache::DepIterator, int, pkgCache::PkgIterator&)@Base" 0.8.0
  (c++)"pkgDepCache::MarkAuto(pkgCache::PkgIterator const&, bool)@Base" 0.8.0
  (c++)"pkgDepCache::MarkKeep(pkgCache::PkgIterator const&, bool, bool, unsigned long)@Base" 0.8.0
- (c++)"pkgDepCache::AddStates(pkgCache::PkgIterator const&, int)@Base" 0.8.0
  (c++)"pkgDepCache::pkgDepCache(pkgCache*, pkgDepCache::Policy*)@Base" 0.8.0
  (c++)"pkgDepCache::~pkgDepCache()@Base" 0.8.0
  (c++)"pkgSimulate::ShortBreaks()@Base" 0.8.0
@@ -303,13 +280,6 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"pkgSimulate::Configure(pkgCache::PkgIterator)@Base" 0.8.0
  (c++)"pkgSimulate::pkgSimulate(pkgDepCache*)@Base" 0.8.0
  (c++)"pkgSimulate::~pkgSimulate()@Base" 0.8.0
- (c++)"MD5Summation::Add(unsigned char const*, unsigned long)@Base" 0.8.0
- (c++)"MD5Summation::AddFD(int, unsigned long)@Base" 0.8.0
- (c++)"MD5Summation::Result()@Base" 0.8.0
- (c++)"MD5Summation::MD5Summation()@Base" 0.8.0
- (c++)"SHA1SumValue::Set(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
- (c++)"SHA1SumValue::SHA1SumValue(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
- (c++)"SHA1SumValue::SHA1SumValue()@Base" 0.8.0
  (c++)"debIFTypePkg::~debIFTypePkg()@Base" 0.8.0
  (c++)"debIFTypeSrc::~debIFTypeSrc()@Base" 0.8.0
  (c++)"debSLTypeDeb::~debSLTypeDeb()@Base" 0.8.0
@@ -391,10 +361,6 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"Configuration::Configuration(Configuration::Item const*)@Base" 0.8.0
  (c++)"Configuration::Configuration()@Base" 0.8.0
  (c++)"Configuration::~Configuration()@Base" 0.8.0
- (c++)"SHA1Summation::Add(unsigned char const*, unsigned long)@Base" 0.8.0
- (c++)"SHA1Summation::AddFD(int, unsigned long)@Base" 0.8.0
- (c++)"SHA1Summation::Result()@Base" 0.8.0
- (c++)"SHA1Summation::SHA1Summation()@Base" 0.8.0
  (c++)"WeakPointable::~WeakPointable()@Base" 0.8.0
  (c++)"debListParser::NewVersion(pkgCache::VerIterator&)@Base" 0.8.0
  (c++)"debListParser::UsePackage(pkgCache::PkgIterator&, pkgCache::VerIterator&)@Base" 0.8.0
@@ -420,7 +386,6 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"debListParser::GrabWord(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, debListParser::WordList*, unsigned char&)@Base" 0.8.0
  (c++)"debListParser::debListParser(FileFd*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
  (c++)"debListParser::~debListParser()@Base" 0.8.0
- (c++)"pkgAcqArchive::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
  (c++)"pkgAcqArchive::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
  (c++)"pkgAcqArchive::DescURI()@Base" 0.8.0
  (c++)"pkgAcqArchive::HashSum()@Base" 0.8.0
@@ -431,7 +396,6 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"pkgAcqArchive::pkgAcqArchive(pkgAcquire*, pkgSourceList*, pkgRecords*, pkgCache::VerIterator const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 0.8.0
  (c++)"pkgAcqArchive::~pkgAcqArchive()@Base" 0.8.0
  (c++)"pkgAcqMetaSig::Custom600Headers()@Base" 0.8.0
- (c++)"pkgAcqMetaSig::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
  (c++)"pkgAcqMetaSig::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
  (c++)"pkgAcqMetaSig::DescURI()@Base" 0.8.0
  (c++)"pkgAcqMetaSig::~pkgAcqMetaSig()@Base" 0.8.0
@@ -470,16 +434,9 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"OpTextProgress::Update()@Base" 0.8.0
  (c++)"OpTextProgress::OpTextProgress(Configuration&)@Base" 0.8.0
  (c++)"OpTextProgress::~OpTextProgress()@Base" 0.8.0
- (c++)"SHA256SumValue::Set(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
- (c++)"SHA256SumValue::SHA256SumValue(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
- (c++)"SHA256SumValue::SHA256SumValue()@Base" 0.8.0
  (c++)"debIFTypeTrans::~debIFTypeTrans()@Base" 0.8.0
  (c++)"debStatusIndex::debStatusIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
  (c++)"debStatusIndex::~debStatusIndex()@Base" 0.8.0
- (c++)"SHA256Summation::Add(unsigned char const*, unsigned long)@Base" 0.8.0
- (c++)"SHA256Summation::AddFD(int, unsigned long)@Base" 0.8.0
- (c++)"SHA256Summation::Result()@Base" 0.8.0
- (c++)"SHA256Summation::SHA256Summation()@Base" 0.8.0
  (c++)"debIFTypeStatus::~debIFTypeStatus()@Base" 0.8.0
  (c++)"debRecordParser::Maintainer()@Base" 0.8.0
  (c++)"debRecordParser::SHA256Hash()@Base" 0.8.0
@@ -510,7 +467,6 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"debSourcesIndex::~debSourcesIndex()@Base" 0.8.0
  (c++)"pkgAcqDiffIndex::ParseDiffIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
  (c++)"pkgAcqDiffIndex::Custom600Headers()@Base" 0.8.0
- (c++)"pkgAcqDiffIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
  (c++)"pkgAcqDiffIndex::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
  (c++)"pkgAcqDiffIndex::DescURI()@Base" 0.8.0
  (c++)"pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, HashString)@Base" 0.8.0
@@ -519,7 +475,6 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"pkgAcqMetaIndex::VerifyVendor(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
  (c++)"pkgAcqMetaIndex::RetrievalDone(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
  (c++)"pkgAcqMetaIndex::Custom600Headers()@Base" 0.8.0
- (c++)"pkgAcqMetaIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
  (c++)"pkgAcqMetaIndex::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
  (c++)"pkgAcqMetaIndex::DescURI()@Base" 0.8.0
  (c++)"pkgAcqMetaIndex::AuthDone(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
@@ -536,7 +491,6 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"debPackagesIndex::debPackagesIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
  (c++)"debPackagesIndex::~debPackagesIndex()@Base" 0.8.0
  (c++)"pkgAcqIndexDiffs::QueueNextDiff()@Base" 0.8.0
- (c++)"pkgAcqIndexDiffs::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
  (c++)"pkgAcqIndexDiffs::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
  (c++)"pkgAcqIndexDiffs::Finish(bool)@Base" 0.8.0
  (c++)"pkgAcqIndexDiffs::DescURI()@Base" 0.8.0
@@ -553,7 +507,6 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"pkgAcquireStatus::Pulse(pkgAcquire*)@Base" 0.8.0
  (c++)"pkgAcquireStatus::Start()@Base" 0.8.0
  (c++)"pkgAcquireStatus::IMSHit(pkgAcquire::ItemDesc&)@Base" 0.8.0
- (c++)"pkgAcquireStatus::Fetched(unsigned long, unsigned long)@Base" 0.8.0
  (c++)"pkgAcquireStatus::pkgAcquireStatus()@Base" 0.8.0
  (c++)"pkgAcquireStatus::~pkgAcquireStatus()@Base" 0.8.0
  (c++)"PreferenceSection::TrimRecord(bool, char const*&)@Base" 0.8.0
@@ -569,7 +522,6 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"pkgCacheGenerator::FinishCache(OpProgress*)@Base" 0.8.0
  (c++)"pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator&, pkgCacheGenerator::ListParser&)@Base" 0.8.0
  (c++)"pkgCacheGenerator::AllocateInMap(unsigned long const&)@Base" 0.8.0
- (c++)"pkgCacheGenerator::NewDescription(pkgCache::DescIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, MD5SumValue const&, unsigned int)@Base" 0.8.0
  (c++)"pkgCacheGenerator::MakeStatusCache(pkgSourceList&, OpProgress*, MMap**, bool)@Base" 0.8.0
  (c++)"pkgCacheGenerator::WriteUniqString(char const*, unsigned int)@Base" 0.8.0
  (c++)"pkgCacheGenerator::WriteStringInMap(char const*)@Base" 0.8.0
@@ -598,13 +550,11 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"pkgPackageManager::ImmediateAdd(pkgCache::PkgIterator, bool, unsigned int const&)@Base" 0.8.0
  (c++)"pkgPackageManager::OrderInstall()@Base" 0.8.0
  (c++)"pkgPackageManager::DepAlwaysTrue(pkgCache::DepIterator)@Base" 0.8.0
- (c++)"pkgPackageManager::SmartConfigure(pkgCache::PkgIterator)@Base" 0.8.0
  (c++)"pkgPackageManager::CheckRConflicts(pkgCache::PkgIterator, pkgCache::DepIterator, char const*)@Base" 0.8.0
  (c++)"pkgPackageManager::CreateOrderList()@Base" 0.8.0
  (c++)"pkgPackageManager::DoInstallPostFork(int)@Base" 0.8.0
  (c++)"pkgPackageManager::Go(int)@Base" 0.8.0
  (c++)"pkgPackageManager::Reset()@Base" 0.8.0
- (c++)"pkgPackageManager::DepAdd(pkgOrderList&, pkgCache::PkgIterator, int)@Base" 0.8.0
  (c++)"pkgPackageManager::Remove(pkgCache::PkgIterator, bool)@Base" 0.8.0
  (c++)"pkgPackageManager::Install(pkgCache::PkgIterator, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
  (c++)"pkgPackageManager::Configure(pkgCache::PkgIterator)@Base" 0.8.0
@@ -648,20 +598,6 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"pkgVersioningSystem::~pkgVersioningSystem()@Base" 0.8.0
  (c++)"debTranslationsIndex::debTranslationsIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, char const*)@Base" 0.8.0
  (c++)"debTranslationsIndex::~debTranslationsIndex()@Base" 0.8.0
- (c++)"APT::PackageSet::FromString(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, APT::CacheSetHelper&)@Base" 0.8.0
- (c++)"APT::PackageSet::FromCommandLine(pkgCacheFile&, char const**, APT::CacheSetHelper&)@Base" 0.8.0
- (c++)"APT::PackageSet::GroupedFromCommandLine(pkgCacheFile&, char const**, std::list<APT::PackageSet::Modifier, std::allocator<APT::PackageSet::Modifier> > const&, unsigned short const&, APT::CacheSetHelper&)@Base" 0.8.0
- (c++)"APT::PackageSet::FromName(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, APT::CacheSetHelper&)@Base" 0.8.0
- (c++)"APT::PackageSet::FromTask(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::CacheSetHelper&)@Base" 0.8.0
- (c++)"APT::PackageSet::FromRegEx(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::CacheSetHelper&)@Base" 0.8.0
- (c++)"APT::PackageSet::~PackageSet()@Base" 0.8.0
- (c++)"APT::VersionSet::FromString(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::VersionSet::Version const&, APT::CacheSetHelper&, bool const&)@Base" 0.8.0
- (c++)"APT::VersionSet::FromPackage(pkgCacheFile&, pkgCache::PkgIterator const&, APT::VersionSet::Version const&, APT::CacheSetHelper&)@Base" 0.8.0
- (c++)"APT::VersionSet::FromCommandLine(pkgCacheFile&, char const**, APT::VersionSet::Version const&, APT::CacheSetHelper&)@Base" 0.8.0
- (c++)"APT::VersionSet::getCandidateVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.0
- (c++)"APT::VersionSet::getInstalledVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.0
- (c++)"APT::VersionSet::GroupedFromCommandLine(pkgCacheFile&, char const**, std::list<APT::VersionSet::Modifier, std::allocator<APT::VersionSet::Modifier> > const&, unsigned short const&, APT::CacheSetHelper&)@Base" 0.8.0
- (c++)"APT::VersionSet::~VersionSet()@Base" 0.8.0
  (c++)"APT::CacheFilter::PackageNameMatchesRegEx::PackageNameMatchesRegEx(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
  (c++)"APT::CacheFilter::PackageNameMatchesRegEx::~PackageNameMatchesRegEx()@Base" 0.8.0
  (c++)"APT::CacheFilter::PackageNameMatchesRegEx::operator()(pkgCache::GrpIterator const&)@Base" 0.8.0
@@ -670,17 +606,8 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"APT::Configuration::getArchitectures(bool const&)@Base" 0.8.0
  (c++)"APT::Configuration::checkArchitecture(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
  (c++)"APT::Configuration::getCompressionTypes(bool const&)@Base" 0.8.0
- (c++)"APT::CacheSetHelper::canNotFindTask(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
- (c++)"APT::CacheSetHelper::canNotFindRegEx(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
- (c++)"APT::CacheSetHelper::canNotFindAllVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0
- (c++)"APT::CacheSetHelper::canNotFindPackage(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
  (c++)"APT::CacheSetHelper::canNotFindPkgName(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
- (c++)"APT::CacheSetHelper::showTaskSelection(APT::PackageSet const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
- (c++)"APT::CacheSetHelper::showRegExSelection(APT::PackageSet const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
  (c++)"APT::CacheSetHelper::canNotFindNewestVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0
- (c++)"APT::CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const&, pkgCache::VerIterator, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool const&)@Base" 0.8.0
- (c++)"APT::CacheSetHelper::canNotFindCandInstVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0
- (c++)"APT::CacheSetHelper::canNotFindInstCandVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0
  (c++)"APT::CacheSetHelper::canNotFindCandidateVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0
  (c++)"APT::CacheSetHelper::canNotFindInstalledVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0
  (c++)"APT::CacheSetHelper::~CacheSetHelper()@Base" 0.8.0
@@ -696,19 +623,11 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"MMap::MMap(FileFd&, unsigned long)@Base" 0.8.0
  (c++)"MMap::MMap(unsigned long)@Base" 0.8.0
  (c++)"MMap::~MMap()@Base" 0.8.0
- (c++)"FileFd::OpenDescriptor(int, FileFd::OpenMode, bool)@Base" 0.8.0
- (c++)"FileFd::Open(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, FileFd::OpenMode, unsigned long)@Base" 0.8.0
- (c++)"FileFd::Read(void*, unsigned long, unsigned long*)@Base" 0.8.0
- (c++)"FileFd::Seek(unsigned long)@Base" 0.8.0
  (c++)"FileFd::Size()@Base" 0.8.0
- (c++)"FileFd::Skip(unsigned long)@Base" 0.8.0
  (c++)"FileFd::Sync()@Base" 0.8.0
  (c++)"FileFd::Tell()@Base" 0.8.0
  (c++)"FileFd::Close()@Base" 0.8.0
- (c++)"FileFd::Write(void const*, unsigned long)@Base" 0.8.0
- (c++)"FileFd::Truncate(unsigned long)@Base" 0.8.0
  (c++)"FileFd::~FileFd()@Base" 0.8.0
- (c++)"Hashes::AddFD(int, unsigned long)@Base" 0.8.0
  (c++)"Vendor::CheckDist(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
  (c++)"Vendor::Vendor(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<Vendor::Fingerprint*, std::allocator<Vendor::Fingerprint*> >*)@Base" 0.8.0
  (c++)"Vendor::~Vendor()@Base" 0.8.0
@@ -796,7 +715,6 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"pkgDPkgPM::~pkgDPkgPM()@Base" 0.8.0
  (c++)"pkgPolicy::GetPriority(pkgCache::PkgIterator const&)@Base" 0.8.0
  (c++)"pkgPolicy::InitDefaults()@Base" 0.8.0
- (c++)"pkgPolicy::IsImportantDep(pkgCache::DepIterator const&)@Base" 0.8.0
  (c++)"pkgPolicy::GetCandidateVer(pkgCache::PkgIterator const&)@Base" 0.8.0
  (c++)"pkgPolicy::PkgPin::~PkgPin()@Base" 0.8.0
  (c++)"pkgPolicy::GetMatch(pkgCache::PkgIterator const&)@Base" 0.8.0
@@ -815,10 +733,6 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"HashString::toStr() const@Base" 0.8.0
  (c++)"CommandLine::FileSize() const@Base" 0.8.0
  (c++)"GlobalError::empty(GlobalError::MsgType const&) const@Base" 0.8.0
- (c++)"MD5SumValue::Value() const@Base" 0.8.0
- (c++)"MD5SumValue::operator==(MD5SumValue const&) const@Base" 0.8.0
- (c++)"SHA1SumValue::Value() const@Base" 0.8.0
- (c++)"SHA1SumValue::operator==(SHA1SumValue const&) const@Base" 0.8.0
  (c++)"debIFTypePkg::CreatePkgParser(pkgCache::PkgFileIterator) const@Base" 0.8.0
  (c++)"debSLTypeDeb::CreateItem(std::vector<metaIndex*, std::allocator<metaIndex*> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&) const@Base" 0.8.0
  (c++)"indexRecords::GetValidUntil() const@Base" 0.8.0
@@ -857,8 +771,6 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"pkgTagSection::FindS(char const*) const@Base" 0.8.0
  (c++)"pkgTagSection::FindULL(char const*, unsigned long long const&) const@Base" 0.8.0
  (c++)"pkgTagSection::FindFlag(char const*, unsigned long&, unsigned long) const@Base" 0.8.0
- (c++)"SHA256SumValue::Value() const@Base" 0.8.0
- (c++)"SHA256SumValue::operator==(SHA256SumValue const&) const@Base" 0.8.0
  (c++)"debStatusIndex::FindInCache(pkgCache&) const@Base" 0.8.0
  (c++)"debStatusIndex::HasPackages() const@Base" 0.8.0
  (c++)"debStatusIndex::Size() const@Base" 0.8.0
@@ -937,7 +849,6 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++)"pkgCache::VerIterator::Downloadable() const@Base" 0.8.0
  (c++)"pkgCache::VerIterator::OwnerPointer() const@Base" 0.8.0
  (c++)"pkgCache::VerIterator::TranslatedDescription() const@Base" 0.8.0
- (c++)"pkgCache::VerIterator::Pseudo() const@Base" 0.8.0
  (c++)"pkgCache::VerIterator::RelStr() const@Base" 0.8.0
  (c++)"pkgCache::VerIterator::Automatic() const@Base" 0.8.0
  (c++)"pkgCache::DescIterator::OwnerPointer() const@Base" 0.8.0
@@ -1233,40 +1144,39 @@ libapt-pkg.so.4.10 libapt-pkg4.10
 # (c++|regex|optional=template)"^SPtrArray<[^ ]+>::~SPtrArray\(\)@Base$" 0.8.0
 # (c++|optional=template)"SPtrArray<unsigned char>::~SPtrArray()@Base" 0.8.0
 ### gcc-4.6 specific
- (c++|optional=template)"SPtrArray<pkgCache::Version*>::~SPtrArray()@Base" 0.8.0
+# (c++|optional=template)"SPtrArray<pkgCache::Version*>::~SPtrArray()@Base" 0.8.0
+# (c++|optional=inline)"IndexTarget::~IndexTarget()@Base" 0.8.11
  (c++|regex|optional=std)"^std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string<char( const|)\*>\(.+\)@Base$" 0.8.0
  (c++|regex|optional=std)"^std::vector<DiffInfo, .+@Base$" 0.8.0
  (c++|regex|optional=std)"^std::vector<.+ >::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0
-# (c++|optional=strange)"pkgCache::VerIterator::VerIterator(pkgCache&, pkgCache::Version*)@Base" 0.8.0
+ (c++|optional=template)"HashSumValue<160>::operator std::basic_string<char, std::char_traits<char>, std::allocator<char> >() const@Base" 0.8.16~exp14
 ### architecture specific: va_list
- (arch=armel armhf|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, std::__va_list&) const@Base" 0.8.15~exp1 1
- (arch=i386 hurd-i386 kfreebsd-i386|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, char*&) const@Base" 0.8.15~exp1 1
- (arch=hppa ia64 mips mipsel sparc sparc64|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, void*&) const@Base" 0.8.15~exp1 1
- (arch=amd64 kfreebsd-amd64 powerpc powerpcspe s390|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, __va_list_tag (&) [1]) const@Base" 0.8.15~exp1 1
- (arch=sh4|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, __builtin_va_list&) const@Base" 0.8.15~exp1 1
- (arch=alpha|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, __va_list_tag&) const@Base" 0.8.15~exp1 1
+ (arch=armel armhf|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, std::__va_list&) const@Base" 0.8.15~exp1
+ (arch=i386 hurd-i386 kfreebsd-i386|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, char*&) const@Base" 0.8.15~exp1
+ (arch=hppa ia64 mips mipsel sparc sparc64|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, void*&) const@Base" 0.8.15~exp1
+ (arch=amd64 kfreebsd-amd64 powerpc powerpcspe s390|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, __va_list_tag (&) [1]) const@Base" 0.8.15~exp1
+ (arch=sh4|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, __builtin_va_list&) const@Base" 0.8.15~exp1
+ (arch=alpha|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, __va_list_tag&) const@Base" 0.8.15~exp1
 ### architecture specific: va_list & size_t
- (arch=i386 hurd-i386 kfreebsd-i386|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, char*&, unsigned int&)@Base" 0.8.11.4 1
- (arch=armel armhf|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, std::__va_list&, unsigned int&)@Base" 0.8.11.4 1
- (arch=alpha|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag&, unsigned long&)@Base" 0.8.11.4 1
- (arch=powerpc powerpcspe|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag (&) [1], unsigned int&)@Base" 0.8.11.4 1
- (arch=amd64 kfreebsd-amd64 s390|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag (&) [1], unsigned long&)@Base" 0.8.11.4 1
- (arch=hppa mips mipsel sparc|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned int&)@Base" 0.8.11.4 1
- (arch=ia64 sparc64|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned long&)@Base" 0.8.11.4 1
- (arch=sh4|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __builtin_va_list&, unsigned int&)@Base" 0.8.11.4 1
- (arch=i386 hurd-i386 kfreebsd-i386|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, char*&, int, unsigned int&)@Base" 0.8.11.4 1
- (arch=armel armhf|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, std::__va_list&, int, unsigned int&)@Base" 0.8.11.4 1
- (arch=alpha|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag&, int, unsigned long&)@Base" 0.8.11.4 1
- (arch=powerpc powerpcspe|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag (&) [1], int, unsigned int&)@Base" 0.8.11.4 1
- (arch=amd64 kfreebsd-amd64 s390|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag (&) [1], int, unsigned long&)@Base" 0.8.11.4 1
- (arch=hppa mips mipsel sparc|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned int&)@Base" 0.8.11.4 1
+ (arch=i386 hurd-i386 kfreebsd-i386|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, char*&, unsigned int&)@Base" 0.8.11.4
+ (arch=armel armhf|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, std::__va_list&, unsigned int&)@Base" 0.8.11.4
+ (arch=alpha|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag&, unsigned long&)@Base" 0.8.11.4
+ (arch=powerpc powerpcspe|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag (&) [1], unsigned int&)@Base" 0.8.11.4
+ (arch=amd64 kfreebsd-amd64 s390|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag (&) [1], unsigned long&)@Base" 0.8.11.4
+ (arch=hppa mips mipsel sparc|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned int&)@Base" 0.8.11.4
+ (arch=ia64 sparc64|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned long&)@Base" 0.8.11.4
+ (arch=sh4|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __builtin_va_list&, unsigned int&)@Base" 0.8.11.4
+ (arch=i386 hurd-i386 kfreebsd-i386|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, char*&, int, unsigned int&)@Base" 0.8.11.4
+ (arch=armel armhf|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, std::__va_list&, int, unsigned int&)@Base" 0.8.11.4
+ (arch=alpha|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag&, int, unsigned long&)@Base" 0.8.11.4
+ (arch=powerpc powerpcspe|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag (&) [1], int, unsigned int&)@Base" 0.8.11.4
+ (arch=amd64 kfreebsd-amd64 s390|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag (&) [1], int, unsigned long&)@Base" 0.8.11.4
+ (arch=hppa mips mipsel sparc|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned int&)@Base" 0.8.11.4
  (arch=ia64 sparc64|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned long&)@Base" 0.8.11.4 1
- (arch=sh4|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __builtin_va_list&, int, unsigned int&)@Base" 0.8.11.4 1
+ (arch=sh4|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __builtin_va_list&, int, unsigned int&)@Base" 0.8.11.4
 ### architecture specific: size_t
  (arch=i386 armel armhf hppa hurd-i386 kfreebsd-i386 mips mipsel powerpc powerpcspe sh4 sparc|c++)"_strtabexpand(char*, unsigned int)@Base" 0.8.0
  (arch=alpha amd64 ia64 kfreebsd-amd64 s390 sparc64|c++)"_strtabexpand(char*, unsigned long)@Base" 0.8.0
- (arch=i386 armel armhf hppa hurd-i386 kfreebsd-i386 mips mipsel powerpc powerpcspe sh4 sparc|c++)"indexRecords::parseSumData(char const*&, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int&)@Base" 0.8.0
- (arch=alpha amd64 ia64 kfreebsd-amd64 s390 sparc64|c++)"indexRecords::parseSumData(char const*&, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned long&)@Base" 0.8.0
 ### try to ignore std:: template instances
  (c++|regex|optional=std)"^(void |)std::[^ ]+<.+ >::(_|~).+\(.*\)@Base$" 0.8.0
  (c++|regex|optional=std)"^std::[^ ]+<.+ >::(append|insert|reserve|operator[^ ]+)\(.*\)@Base$" 0.8.0
@@ -1278,58 +1188,346 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++|regex|optional=std)"^typeinfo name for std::iterator<.*>@Base$" 0.8.0
  (c++|regex|optional=std)"^typeinfo for std::iterator<.*>@Base$" 0.8.0
 ###
- (c++)"Configuration::MatchAgainstConfig::clearPatterns()@Base" 0.8.1 1
- (c++)"CreateAPTDirectoryIfNeeded(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.2 1
- (c++)"FileFd::FileSize()@Base" 0.8.8 1
- (c++)"Base256ToNum(char const*, unsigned long&, unsigned int)@Base" 0.8.11 1
- (c++)"pkgDepCache::SetCandidateRelease(pkgCache::VerIterator, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::list<std::pair<pkgCache::VerIterator, pkgCache::VerIterator>, std::allocator<std::pair<pkgCache::VerIterator, pkgCache::VerIterator> > >&)@Base" 0.8.11 1
- (c++)"pkgDepCache::SetCandidateRelease(pkgCache::VerIterator, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11 1
- (c++)"RealFileExists(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.11 1
- (c++)"StripEpoch(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11 1
- (c++)"IndexTarget::~IndexTarget()@Base" 0.8.11 1
- (c++)"pkgAcqIndex::Init(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11 1
- (c++)"pkgAcqIndex::pkgAcqIndex(pkgAcquire*, IndexTarget const*, HashString const&, indexRecords const*)@Base" 0.8.11 1
- (c++)"pkgTagSection::FindFlag(unsigned long&, unsigned long, char const*, char const*)@Base" 0.8.11 1
- (c++)"pkgAcqSubIndex::ParseIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11 1
- (c++)"pkgAcqSubIndex::Custom600Headers()@Base" 0.8.11 1
- (c++)"pkgAcqSubIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.11 1
- (c++)"pkgAcqSubIndex::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.11 1
- (c++)"pkgAcqSubIndex::DescURI()@Base" 0.8.11 1
- (c++)"pkgAcqSubIndex::pkgAcqSubIndex(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, HashString const&)@Base" 0.8.11 1
- (c++)"pkgAcqSubIndex::~pkgAcqSubIndex()@Base" 0.8.11 1
- (c++)"pkgAcqMetaClearSig::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.11 1
- (c++)"pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 0.8.11 1
- (c++)"pkgAcqMetaClearSig::~pkgAcqMetaClearSig()@Base" 0.8.11 1
- (c++)"pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire*, IndexTarget const*, HashString const&, indexRecords const*)@Base" 0.8.11 1
- (c++)"IndexTarget::IsOptional() const@Base" 0.8.11 1
- (c++)"IndexTarget::IsSubIndex() const@Base" 0.8.11 1
- (c++)"debReleaseIndex::TranslationIndexURI(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.11 1
- (c++)"debReleaseIndex::TranslationIndexURISuffix(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.11 1
- (c++)"typeinfo for pkgAcqSubIndex@Base" 0.8.11 1
- (c++)"typeinfo for pkgAcqMetaClearSig@Base" 0.8.11 1
- (c++)"typeinfo name for pkgAcqSubIndex@Base" 0.8.11 1
- (c++)"typeinfo name for pkgAcqMetaClearSig@Base" 0.8.11 1
- (c++)"vtable for pkgAcqSubIndex@Base" 0.8.11 1
- (c++)"vtable for pkgAcqMetaClearSig@Base" 0.8.11 1
- (c++)"FindMountPointForDevice(char const*)@Base" 0.8.12 1
- (c++)"pkgUdevCdromDevices::ScanForRemovable(bool)@Base" 0.8.12 1
- (c++)"APT::Configuration::Compressor::Compressor(char const*, char const*, char const*, char const*, char const*, unsigned short)@Base" 0.8.12 1
- (c++)"APT::Configuration::Compressor::~Compressor()@Base" 0.8.12 1
- (c++)"APT::Configuration::getCompressors(bool)@Base" 0.8.12 1
- (c++)"APT::Configuration::getCompressorExtensions()@Base" 0.8.12 1
- (c++)"APT::Configuration::setDefaultConfigurationForCompressors()@Base" 0.8.12 1
- (c++)"pkgDepCache::SetCandidateVersion(pkgCache::VerIterator, bool const&)@Base" 0.8.12 1
- (c++)"pkgAcqMetaClearSig::Custom600Headers()@Base" 0.8.13 1
- (c++|optional=private)"debListParser::NewProvidesAllArch(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.13.2 1
- (c++|optional=private)"PrintMode(char)@Base" 0.8.13.2 1
- (c++)"pkgDepCache::IsModeChangeOk(pkgDepCache::ModeList, pkgCache::PkgIterator const&, unsigned long, bool)@Base" 0.8.13.2 1
- (c++)"pkgPackageManager::SmartUnPack(pkgCache::PkgIterator, bool)@Base" 0.8.15~exp1 1
- (c++)"pkgCache::DepIterator::IsNegative() const@Base" 0.8.15~exp1 1
- (c++)"Configuration::CndSet(char const*, int)@Base" 0.8.15.3 1
- (c++)"pkgProblemResolver::InstOrNewPolicyBroken(pkgCache::PkgIterator)@Base" 0.8.15.3 1
- (c++)"DeEscapeString(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.15.4 1
- (c++)"GetModificationTime(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.15.6 1
- (c++)"pkgSourceList::GetLastModifiedTime()@Base" 0.8.15.6 1
- (c++)"pkgCacheGenerator::NewDepends(pkgCache::PkgIterator&, pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int const&, unsigned int const&, unsigned int*&)@Base" 0.8.15.6 1
- (c++)"pkgCacheFile::RemoveCaches()@Base" 0.8.15.7 1
- (c++)"pkgOrderList::VisitNode(pkgCache::PkgIterator, char const*)@Base" 0.8.15.7 1
+ (c++)"Configuration::MatchAgainstConfig::clearPatterns()@Base" 0.8.1
+ (c++)"CreateAPTDirectoryIfNeeded(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.2
+ (c++)"FileFd::FileSize()@Base" 0.8.8
+ (c++)"Base256ToNum(char const*, unsigned long&, unsigned int)@Base" 0.8.11
+ (c++)"pkgDepCache::SetCandidateRelease(pkgCache::VerIterator, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::list<std::pair<pkgCache::VerIterator, pkgCache::VerIterator>, std::allocator<std::pair<pkgCache::VerIterator, pkgCache::VerIterator> > >&)@Base" 0.8.11
+ (c++)"pkgDepCache::SetCandidateRelease(pkgCache::VerIterator, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11
+ (c++)"RealFileExists(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.11
+ (c++)"StripEpoch(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11
+ (c++)"pkgAcqIndex::Init(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11
+ (c++)"pkgAcqIndex::pkgAcqIndex(pkgAcquire*, IndexTarget const*, HashString const&, indexRecords const*)@Base" 0.8.11
+ (c++)"pkgTagSection::FindFlag(unsigned long&, unsigned long, char const*, char const*)@Base" 0.8.11
+ (c++)"pkgAcqSubIndex::ParseIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11
+ (c++)"pkgAcqSubIndex::Custom600Headers()@Base" 0.8.11
+ (c++)"pkgAcqSubIndex::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.11
+ (c++)"pkgAcqSubIndex::DescURI()@Base" 0.8.11
+ (c++)"pkgAcqSubIndex::pkgAcqSubIndex(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, HashString const&)@Base" 0.8.11
+ (c++)"pkgAcqSubIndex::~pkgAcqSubIndex()@Base" 0.8.11
+ (c++)"pkgAcqMetaClearSig::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.11
+ (c++)"pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 0.8.11
+ (c++)"pkgAcqMetaClearSig::~pkgAcqMetaClearSig()@Base" 0.8.11
+ (c++)"pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire*, IndexTarget const*, HashString const&, indexRecords const*)@Base" 0.8.11
+ (c++)"IndexTarget::IsOptional() const@Base" 0.8.11
+ (c++)"IndexTarget::IsSubIndex() const@Base" 0.8.11
+ (c++)"debReleaseIndex::TranslationIndexURI(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.11
+ (c++)"debReleaseIndex::TranslationIndexURISuffix(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.11
+ (c++)"typeinfo for pkgAcqSubIndex@Base" 0.8.11
+ (c++)"typeinfo for pkgAcqMetaClearSig@Base" 0.8.11
+ (c++)"typeinfo name for pkgAcqSubIndex@Base" 0.8.11
+ (c++)"typeinfo name for pkgAcqMetaClearSig@Base" 0.8.11
+ (c++)"vtable for pkgAcqSubIndex@Base" 0.8.11
+ (c++)"vtable for pkgAcqMetaClearSig@Base" 0.8.11
+ (c++)"FindMountPointForDevice(char const*)@Base" 0.8.12
+ (c++)"pkgUdevCdromDevices::ScanForRemovable(bool)@Base" 0.8.12
+ (c++)"APT::Configuration::Compressor::Compressor(char const*, char const*, char const*, char const*, char const*, unsigned short)@Base" 0.8.12
+ (c++)"APT::Configuration::Compressor::~Compressor()@Base" 0.8.12
+ (c++)"APT::Configuration::getCompressors(bool)@Base" 0.8.12
+ (c++)"APT::Configuration::getCompressorExtensions()@Base" 0.8.12
+ (c++)"APT::Configuration::setDefaultConfigurationForCompressors()@Base" 0.8.12
+ (c++)"pkgAcqMetaClearSig::Custom600Headers()@Base" 0.8.13
+ (c++|optional=private)"debListParser::NewProvidesAllArch(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.13.2
+ (c++|optional=private)"PrintMode(char)@Base" 0.8.13.2
+ (c++)"pkgDepCache::IsModeChangeOk(pkgDepCache::ModeList, pkgCache::PkgIterator const&, unsigned long, bool)@Base" 0.8.13.2
+ (c++)"pkgCache::DepIterator::IsNegative() const@Base" 0.8.15~exp1
+ (c++)"Configuration::CndSet(char const*, int)@Base" 0.8.15.3
+ (c++)"pkgProblemResolver::InstOrNewPolicyBroken(pkgCache::PkgIterator)@Base" 0.8.15.3
+ (c++)"DeEscapeString(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.15.4
+ (c++)"GetModificationTime(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.15.6
+ (c++)"pkgSourceList::GetLastModifiedTime()@Base" 0.8.15.6
+ (c++)"pkgCacheGenerator::NewDepends(pkgCache::PkgIterator&, pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int const&, unsigned int const&, unsigned int*&)@Base" 0.8.15.6
+ (c++)"pkgCacheFile::RemoveCaches()@Base" 0.8.15.7
+ (c++)"pkgOrderList::VisitNode(pkgCache::PkgIterator, char const*)@Base" 0.8.15.7
+### external dependency resolver ###
+ (c++)"edspIFType::~edspIFType()@Base" 0.8.16~exp2
+ (c++)"edspSystem::Initialize(Configuration&)@Base" 0.8.16~exp2
+ (c++)"edspSystem::AddStatusFiles(std::vector<pkgIndexFile*, std::allocator<pkgIndexFile*> >&)@Base" 0.8.16~exp2
+ (c++)"edspSystem::ArchiveSupported(char const*)@Base" 0.8.16~exp2
+ (c++)"edspSystem::Lock()@Base" 0.8.16~exp2
+ (c++)"edspSystem::Score(Configuration const&)@Base" 0.8.16~exp2
+ (c++)"edspSystem::UnLock(bool)@Base" 0.8.16~exp2
+ (c++)"edspSystem::edspSystem()@Base" 0.8.16~exp2
+ (c++)"edspSystem::~edspSystem()@Base" 0.8.16~exp2
+ (c++)"edspListParser::NewVersion(pkgCache::VerIterator&)@Base" 0.8.16~exp2
+ (c++)"edspListParser::Description()@Base" 0.8.16~exp2
+ (c++)"edspListParser::ParseStatus(pkgCache::PkgIterator&, pkgCache::VerIterator&)@Base" 0.8.16~exp2
+ (c++)"edspListParser::VersionHash()@Base" 0.8.16~exp2
+ (c++)"edspListParser::Description_md5()@Base" 0.8.16~exp2
+ (c++)"edspListParser::LoadReleaseInfo(pkgCache::PkgFileIterator&, FileFd&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.16~exp2
+ (c++)"edspListParser::DescriptionLanguage()@Base" 0.8.16~exp2
+ (c++)"edspListParser::edspListParser(FileFd*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.16~exp2
+ (c++)"edspListParser::~edspListParser()@Base" 0.8.16~exp2
+ (c++)"edspIndex::edspIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.16~exp2
+ (c++)"edspIndex::~edspIndex()@Base" 0.8.16~exp2
+ (c++)"edspIFType::CreatePkgParser(pkgCache::PkgFileIterator) const@Base" 0.8.16~exp2
+ (c++)"edspSystem::CreatePM(pkgDepCache*) const@Base" 0.8.16~exp2
+ (c++)"edspSystem::FindIndex(pkgCache::PkgFileIterator, pkgIndexFile*&) const@Base" 0.8.16~exp2
+ (c++)"edspIndex::Merge(pkgCacheGenerator&, OpProgress*) const@Base" 0.8.16~exp2
+ (c++)"edspIndex::GetType() const@Base" 0.8.16~exp2
+ (c++)"EDSP::WriteError(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, _IO_FILE*)@Base" 0.8.16~exp2
+ (c++)"EDSP::ReadRequest(int, std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, bool&, bool&, bool&)@Base" 0.8.16~exp2
+ (c++)"EDSP::ApplyRequest(std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, pkgDepCache&)@Base" 0.8.16~exp2
+ (c++)"EDSP::ReadResponse(int, pkgDepCache&, OpProgress*)@Base" 0.8.16~exp2
+ (c++)"EDSP::StringToBool(char const*, bool)@Base" 0.8.16~exp2
+ (c++)"EDSP::WriteRequest(pkgDepCache&, _IO_FILE*, bool, bool, bool, OpProgress*)@Base" 0.8.16~exp2
+ (c++)"EDSP::ExecuteSolver(char const*, int*, int*)@Base" 0.8.16~exp2
+ (c++)"EDSP::WriteProgress(unsigned short, char const*, _IO_FILE*)@Base" 0.8.16~exp2
+ (c++)"EDSP::WriteScenario(pkgDepCache&, _IO_FILE*, OpProgress*)@Base" 0.8.16~exp2
+ (c++)"EDSP::WriteSolution(pkgDepCache&, _IO_FILE*)@Base" 0.8.16~exp2
+ (c++)"EDSP::ResolveExternal(char const*, pkgDepCache&, bool, bool, bool, OpProgress*)@Base" 0.8.16~exp2
+ (c++)"EDSP::WriteScenarioVersion(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&)@Base" 0.8.16~exp2
+ (c++)"EDSP::WriteScenarioDependency(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&)@Base" 0.8.16~exp2
+ (c++)"EDSP::DepMap@Base" 0.8.16~exp2
+ (c++)"EDSP::PrioMap@Base" 0.8.16~exp2
+ (c++)"EDSP::ReadLine(int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 0.8.16~exp2
+ (c++)"pkgDepCache::Policy::GetPriority(pkgCache::PkgIterator const&)@Base" 0.8.16~exp6
+ (c++)"pkgDepCache::Policy::GetPriority(pkgCache::PkgFileIterator const&)@Base" 0.8.16~exp6
+ (c++)"typeinfo for edspIFType@Base" 0.8.16~exp2
+ (c++)"typeinfo for edspSystem@Base" 0.8.16~exp2
+ (c++)"typeinfo for edspListParser@Base" 0.8.16~exp2
+ (c++)"typeinfo for edspIndex@Base" 0.8.16~exp2
+ (c++)"typeinfo name for edspIFType@Base" 0.8.16~exp2
+ (c++)"typeinfo name for edspSystem@Base" 0.8.16~exp2
+ (c++)"typeinfo name for edspListParser@Base" 0.8.16~exp2
+ (c++)"typeinfo name for edspIndex@Base" 0.8.16~exp2
+ (c++)"vtable for edspIFType@Base" 0.8.16~exp2
+ (c++)"vtable for edspSystem@Base" 0.8.16~exp2
+ (c++)"vtable for edspListParser@Base" 0.8.16~exp2
+ (c++)"vtable for edspIndex@Base" 0.8.16~exp2
+ edspSys@Base 0.8.16~exp2
+### generalisation of checksums (with lfs) -- mostly api-compatible available (without sha512 in previous versions)
+ (c++)"AddCRC16(unsigned short, void const*, unsigned long long)@Base" 0.8.16~exp2
+ (c++)"MD5Summation::Add(unsigned char const*, unsigned long long)@Base" 0.8.16~exp6
+ (c++)"MD5Summation::Result()@Base" 0.8.16~exp2
+ (c++)"MD5Summation::MD5Summation()@Base" 0.8.16~exp2
+ (c++)"SHA1Summation::SHA1Summation()@Base" 0.8.16~exp2
+ (c++)"SHA1Summation::Add(unsigned char const*, unsigned long long)@Base" 0.8.16~exp6
+ (c++)"SHA1Summation::Result()@Base" 0.8.16~exp2
+ (c++)"SHA256Summation::Add(unsigned char const*, unsigned long long)@Base" 0.8.16~exp6
+ (c++)"SHA512Summation::Add(unsigned char const*, unsigned long long)@Base" 0.8.16~exp6
+ (c++)"debRecordParser::SHA512Hash()@Base" 0.8.16~exp2
+ (c++)"pkgRecords::Parser::SHA512Hash()@Base" 0.8.16~exp6
+ (c++)"Hashes::AddFD(int, unsigned long long, bool, bool, bool, bool)@Base" 0.8.16~exp6
+ (c++)"SummationImplementation::AddFD(int, unsigned long long)@Base" 0.8.16~exp6
+ (c++)"typeinfo for MD5Summation@Base" 0.8.16~exp6
+ (c++)"typeinfo for SHA1Summation@Base" 0.8.16~exp6
+ (c++)"typeinfo for SHA256Summation@Base" 0.8.16~exp6
+ (c++)"typeinfo for SHA512Summation@Base" 0.8.16~exp6
+ (c++)"typeinfo for SHA2SummationBase@Base" 0.8.16~exp6
+ (c++)"typeinfo for SummationImplementation@Base" 0.8.16~exp6
+ (c++)"typeinfo name for MD5Summation@Base" 0.8.16~exp6
+ (c++)"typeinfo name for SHA1Summation@Base" 0.8.16~exp6
+ (c++)"typeinfo name for SHA256Summation@Base" 0.8.16~exp6
+ (c++)"typeinfo name for SHA512Summation@Base" 0.8.16~exp6
+ (c++)"typeinfo name for SHA2SummationBase@Base" 0.8.16~exp6
+ (c++)"typeinfo name for SummationImplementation@Base" 0.8.16~exp6
+ (c++)"vtable for MD5Summation@Base" 0.8.16~exp6
+ (c++)"vtable for SHA1Summation@Base" 0.8.16~exp6
+ (c++)"vtable for SHA256Summation@Base" 0.8.16~exp6
+ (c++)"vtable for SHA512Summation@Base" 0.8.16~exp6
+ (c++)"vtable for SHA2SummationBase@Base" 0.8.16~exp6
+ (c++)"vtable for SummationImplementation@Base" 0.8.16~exp6
+### large file support - available in older api-compatible versions without lfs ###
+ (c++)"StrToNum(char const*, unsigned long long&, unsigned int, unsigned int)@Base" 0.8.16~exp6
+ (c++)"OpProgress::SubProgress(unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, float)@Base" 0.8.16~exp6
+ (c++)"OpProgress::OverallProgress(unsigned long long, unsigned long long, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.16~exp6
+ (c++)"OpProgress::Progress(unsigned long long)@Base" 0.8.16~exp6
+ (c++)"SourceCopy::GetFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned long long&)@Base" 0.8.16~exp6
+ (c++)"pkgAcqFile::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.16~exp6
+ (c++)"pkgAcqFile::pkgAcqFile(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.8.16~exp6
+ (c++)"pkgAcquire::UriIterator::~UriIterator()@Base" 0.8.16~exp6
+ (c++)"pkgAcquire::MethodConfig::~MethodConfig()@Base" 0.8.16~exp6
+ (c++)"pkgAcquire::Item::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.16~exp6
+ (c++)"pkgAcquire::Item::Start(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long)@Base" 0.8.16~exp6
+ (c++)"pkgRecords::Parser::RecordField(char const*)@Base" 0.8.16~exp6
+ (c++)"pkgTagFile::Jump(pkgTagSection&, unsigned long long)@Base" 0.8.16~exp6
+ (c++)"pkgTagFile::Offset()@Base" 0.8.16~exp6
+ (c++)"pkgTagFile::pkgTagFile(FileFd*, unsigned long long)@Base" 0.8.16~exp6
+ (c++)"DynamicMMap::RawAllocate(unsigned long long, unsigned long)@Base" 0.8.16~exp6
+ (c++)"PackageCopy::GetFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned long long&)@Base" 0.8.16~exp6
+ (c++)"pkgAcqIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.16~exp6
+ (c++)"indexRecords::parseSumData(char const*&, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned long long&)@Base" 0.8.16~exp6
+ (c++)"pkgAcqArchive::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.16~exp6
+ (c++)"pkgTagSection::~pkgTagSection()@Base" 0.8.16~exp6
+ (c++)"pkgAcqSubIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.16~exp6
+ (c++)"debRecordParser::RecordField(char const*)@Base" 0.8.16~exp6
+ (c++)"debReleaseIndex::SetTrusted(bool)@Base" 0.8.16~exp6
+ (c++)"debReleaseIndex::debReleaseIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.8.16~exp6
+ (c++)"pkgAcqMetaIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.16~exp6
+ (c++)"pkgAcqIndexDiffs::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.16~exp6
+ (c++)"pkgAcqMetaSig::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.16~exp6
+ (c++)"pkgAcqDiffIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.16~exp6
+ (c++)"pkgAcquireStatus::Fetched(unsigned long long, unsigned long long)@Base" 0.8.16~exp6
+ (c++)"PreferenceSection::~PreferenceSection()@Base" 0.8.16~exp6
+ (c++)"pkgCacheGenerator::NewDescription(pkgCache::DescIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, HashSumValue<128> const&, unsigned int)@Base" 0.8.16~exp6
+ (c++)"pkgProblemResolver::ResolveInternal(bool)@Base" 0.8.16~exp6
+ (c++)"pkgProblemResolver::ResolveByKeepInternal()@Base" 0.8.16~exp6
+ (c++)"FileFd::Read(void*, unsigned long long, unsigned long long*)@Base" 0.8.16~exp6
+ (c++)"FileFd::Seek(unsigned long long)@Base" 0.8.16~exp6
+ (c++)"FileFd::Skip(unsigned long long)@Base" 0.8.16~exp6
+ (c++)"FileFd::Write(void const*, unsigned long long)@Base" 0.8.16~exp6
+ (c++)"FileFd::Truncate(unsigned long long)@Base" 0.8.16~exp6
+ (c++)"pkgCache::PkgIterator::PkgIterator(pkgCache&, pkgCache::Package*)@Base" 0.8.16~exp6
+ (c++)"pkgPolicy::GetPriority(pkgCache::PkgFileIterator const&)@Base" 0.8.16~exp6
+ (c++)"OptionalIndexTarget::IsOptional() const@Base" 0.8.16~exp6
+ (c++)"typeinfo for pkgTagFile@Base" 0.8.16~exp6
+ (c++)"typeinfo for IndexTarget@Base" 0.8.16~exp6
+ (c++)"typeinfo for pkgSrcRecords@Base" 0.8.16~exp6
+ (c++)"typeinfo for OptionalIndexTarget@Base" 0.8.16~exp6
+ (c++)"typeinfo for pkgAcquire::UriIterator@Base" 0.8.16~exp6
+ (c++)"typeinfo for pkgAcquire::MethodConfig@Base" 0.8.16~exp6
+ (c++)"typeinfo for pkgAcquire::Queue@Base" 0.8.16~exp6
+ (c++)"typeinfo for pkgAcquire::Worker@Base" 0.8.16~exp6
+ (c++)"typeinfo name for pkgTagFile@Base" 0.8.16~exp6
+ (c++)"typeinfo name for IndexTarget@Base" 0.8.16~exp6
+ (c++)"typeinfo name for pkgSrcRecords@Base" 0.8.16~exp6
+ (c++)"typeinfo name for OptionalIndexTarget@Base" 0.8.16~exp6
+ (c++)"typeinfo name for pkgAcquire::UriIterator@Base" 0.8.16~exp6
+ (c++)"typeinfo name for pkgAcquire::MethodConfig@Base" 0.8.16~exp6
+ (c++)"typeinfo name for pkgAcquire::Queue@Base" 0.8.16~exp6
+ (c++)"typeinfo name for pkgAcquire::Worker@Base" 0.8.16~exp6
+ (c++)"vtable for pkgTagFile@Base" 0.8.16~exp6
+ (c++)"vtable for IndexTarget@Base" 0.8.16~exp6
+ (c++)"vtable for pkgSrcRecords@Base" 0.8.16~exp6
+ (c++)"vtable for OptionalIndexTarget@Base" 0.8.16~exp6
+ (c++)"vtable for pkgAcquire::UriIterator@Base" 0.8.16~exp6
+ (c++)"vtable for pkgAcquire::MethodConfig@Base" 0.8.16~exp6
+ (c++)"vtable for pkgAcquire::Queue@Base" 0.8.16~exp6
+ (c++)"vtable for pkgAcquire::Worker@Base" 0.8.16~exp6
+### remove deprecated parameter
+ (c++)"pkgDepCache::SetCandidateVersion(pkgCache::VerIterator)@Base" 0.8.16~exp6
+ (c++)"pkgDepCache::AddSizes(pkgCache::PkgIterator const&, bool)@Base" 0.8.16~exp6
+ (c++)"pkgDepCache::AddStates(pkgCache::PkgIterator const&, bool)@Base" 0.8.16~exp6
+### used internally by public interfaces - if you use them directly, you can keep the pieces
+ (c++|optional=internal|regex)"^SHA256_.*@Base$" 0.8.16~exp2
+ (c++|optional=internal|regex)"^SHA384_.*@Base$" 0.8.16~exp2
+ (c++|optional=internal|regex)"^SHA512_.*@Base$" 0.8.16~exp2
+### orderlist rework: the touched methods are protected
+# (c++)"pkgPackageManager::SmartConfigure(pkgCache::PkgIterator)@Base" 0.8.0
+# (c++)"pkgPackageManager::DepAdd(pkgOrderList&, pkgCache::PkgIterator, int)@Base" 0.8.0
+# (c++)"pkgPackageManager::SmartUnPack(pkgCache::PkgIterator, bool)@Base" 0.8.15~exp1
+ (c++)"SigINT(int)@Base" 0.8.16~exp14
+ (c++)"pkgPackageManager::SigINTStop@Base" 0.8.16~exp14
+ (c++)"pkgPackageManager::SmartUnPack(pkgCache::PkgIterator, bool, int)@Base" 0.8.16~exp14
+ (c++)"pkgPackageManager::SmartConfigure(pkgCache::PkgIterator, int)@Base" 0.8.16~exp14
+### FileFd rework: supporting different on-the-fly (de)compressing needs more parameter (abi), but the api is stable
+# (c++)"FileFd::OpenDescriptor(int, FileFd::OpenMode, bool)@Base" 0.8.0
+# (c++)"FileFd::Open(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, FileFd::OpenMode, unsigned long)@Base" 0.8.0
+ (c++)"FileFd::OpenDescriptor(int, unsigned int, FileFd::CompressMode, bool)@Base" 0.8.16~exp9
+ (c++)"FileFd::OpenDescriptor(int, unsigned int, APT::Configuration::Compressor const&, bool)@Base" 0.8.16~exp9
+ (c++)"FileFd::ModificationTime()@Base" 0.8.16~exp9
+ (c++)"FileFd::Open(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, FileFd::CompressMode, unsigned long)@Base" 0.8.16~exp9
+ (c++)"FileFd::Open(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, APT::Configuration::Compressor const&, unsigned long)@Base" 0.8.16~exp9
+ (c++)"FileFd::ReadLine(char*, unsigned long long)@Base" 0.8.16~exp9
+ (c++)"SummationImplementation::AddFD(FileFd&, unsigned long long)@Base" 0.8.16~exp9
+ (c++)"Hashes::AddFD(FileFd&, unsigned long long, bool, bool, bool, bool)@Base" 0.8.16~exp9
+ (c++|optional=deprecated,previous-inline)"FileFd::gzFd()@Base" 0.8.0
+ (c++|optional=private)"FileFd::OpenInternDescriptor(unsigned int, APT::Configuration::Compressor const&)@Base" 0.8.16~exp9
+### CacheSet rework: making them real containers breaks bigtime the API (for the CacheSetHelper)
+# (c++)"EDSP::WriteLimitedScenario(pkgDepCache&, _IO_FILE*, APT::PackageSet const&, OpProgress*)@Base" 0.8.16~exp2
+# (c++)"EDSP::WriteScenarioLimitedDependency(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&, APT::PackageSet const&)@Base" 0.8.16~exp2
+# (c++)"APT::PackageSet::FromString(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, APT::CacheSetHelper&)@Base" 0.8.0
+# (c++)"APT::PackageSet::FromCommandLine(pkgCacheFile&, char const**, APT::CacheSetHelper&)@Base" 0.8.0
+# (c++)"APT::PackageSet::GroupedFromCommandLine(pkgCacheFile&, char const**, std::list<APT::PackageSet::Modifier, std::allocator<APT::PackageSet::Modifier> > const&, unsigned short const&, APT::CacheSetHelper&)@Base" 0.8.0
+# (c++)"APT::PackageSet::FromName(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, APT::CacheSetHelper&)@Base" 0.8.0
+# (c++)"APT::PackageSet::FromTask(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::CacheSetHelper&)@Base" 0.8.0
+# (c++)"APT::PackageSet::FromRegEx(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::CacheSetHelper&)@Base" 0.8.0
+# (c++)"APT::PackageSet::~PackageSet()@Base" 0.8.0
+# (c++)"APT::VersionSet::FromString(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::VersionSet::Version const&, APT::CacheSetHelper&, bool const&)@Base" 0.8.0
+# (c++)"APT::VersionSet::FromPackage(pkgCacheFile&, pkgCache::PkgIterator const&, APT::VersionSet::Version const&, APT::CacheSetHelper&)@Base" 0.8.0
+# (c++)"APT::VersionSet::FromCommandLine(pkgCacheFile&, char const**, APT::VersionSet::Version const&, APT::CacheSetHelper&)@Base" 0.8.0
+# (c++)"APT::VersionSet::getCandidateVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.0
+# (c++)"APT::VersionSet::getInstalledVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.0
+# (c++)"APT::VersionSet::GroupedFromCommandLine(pkgCacheFile&, char const**, std::list<APT::VersionSet::Modifier, std::allocator<APT::VersionSet::Modifier> > const&, unsigned short const&, APT::CacheSetHelper&)@Base" 0.8.0
+# (c++)"APT::VersionSet::~VersionSet()@Base" 0.8.0
+# (c++)"APT::CacheSetHelper::showTaskSelection(APT::PackageSet const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
+# (c++)"APT::CacheSetHelper::showRegExSelection(APT::PackageSet const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
+# (c++)"APT::CacheSetHelper::canNotFindTask(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
+# (c++)"APT::CacheSetHelper::canNotFindRegEx(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
+# (c++)"APT::CacheSetHelper::canNotFindAllVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0
+# (c++)"APT::CacheSetHelper::canNotFindPackage(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
+# (c++)"APT::CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const&, pkgCache::VerIterator, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool const&)@Base" 0.8.0
+# (c++)"APT::CacheSetHelper::canNotFindCandInstVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0
+# (c++)"APT::CacheSetHelper::canNotFindInstCandVer(pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.0
+ (c++)"APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::const_iterator::getPkg() const@Base" 0.8.16~exp9
+ (c++)"APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::getConstructor() const@Base" 0.8.16~exp9
+ (c++)"APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::empty() const@Base" 0.8.16~exp9
+ (c++)"APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >::const_iterator::getPkg() const@Base" 0.8.16~exp9
+ (c++)"APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >::getConstructor() const@Base" 0.8.16~exp9
+ (c++)"APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >::empty() const@Base" 0.8.16~exp9
+ (c++)"APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::empty() const@Base" 0.8.16~exp9
+ (c++)"APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator::getVer() const@Base" 0.8.16~exp9
+ (c++)"APT::CacheSetHelper::canNotFindTask(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.16~exp9
+ (c++)"APT::CacheSetHelper::canNotFindRegEx(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.16~exp9
+ (c++)"APT::CacheSetHelper::canNotFindAllVer(APT::VersionContainerInterface*, pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.16~exp9
+ (c++)"APT::CacheSetHelper::canNotFindPackage(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.16~exp9
+ (c++)"APT::CacheSetHelper::showTaskSelection(pkgCache::PkgIterator const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.16~exp9
+ (c++)"APT::CacheSetHelper::showRegExSelection(pkgCache::PkgIterator const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.16~exp9
+ (c++)"APT::CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const&, pkgCache::VerIterator, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.8.16~exp9
+ (c++)"APT::CacheSetHelper::canNotFindCandInstVer(APT::VersionContainerInterface*, pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.16~exp9
+ (c++)"APT::CacheSetHelper::canNotFindInstCandVer(APT::VersionContainerInterface*, pkgCacheFile&, pkgCache::PkgIterator const&)@Base" 0.8.16~exp9
+ (c++)"APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::setConstructor(APT::PackageContainerInterface::Constructor const&)@Base" 0.8.16~exp9
+ (c++)"APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::clear()@Base" 0.8.16~exp9
+ (c++)"APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::insert(pkgCache::PkgIterator const&)@Base" 0.8.16~exp9
+ (c++)"APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >::setConstructor(APT::PackageContainerInterface::Constructor const&)@Base" 0.8.16~exp9
+ (c++)"APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >::clear()@Base" 0.8.16~exp9
+ (c++)"APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >::insert(pkgCache::PkgIterator const&)@Base" 0.8.16~exp9
+ (c++)"APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::clear()@Base" 0.8.16~exp9
+ (c++)"APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::insert(pkgCache::VerIterator const&)@Base" 0.8.16~exp9
+ (c++)"APT::PackageContainerInterface::FromString(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
+ (c++)"APT::PackageContainerInterface::FromCommandLine(APT::PackageContainerInterface*, pkgCacheFile&, char const**, APT::CacheSetHelper&)@Base" 0.8.16~exp9
+ (c++)"APT::PackageContainerInterface::FromModifierCommandLine(unsigned short&, APT::PackageContainerInterface*, pkgCacheFile&, char const*, std::list<APT::PackageContainerInterface::Modifier, std::allocator<APT::PackageContainerInterface::Modifier> > const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
+ (c++)"APT::PackageContainerInterface::FromName(pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
+ (c++)"APT::PackageContainerInterface::FromTask(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::CacheSetHelper&)@Base" 0.8.16~exp9
+ (c++)"APT::PackageContainerInterface::FromRegEx(APT::PackageContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::CacheSetHelper&)@Base" 0.8.16~exp9
+ (c++)"APT::VersionContainerInterface::FromString(APT::VersionContainerInterface*, pkgCacheFile&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, APT::VersionContainerInterface::Version const&, APT::CacheSetHelper&, bool)@Base" 0.8.16~exp9
+ (c++)"APT::VersionContainerInterface::FromPackage(APT::VersionContainerInterface*, pkgCacheFile&, pkgCache::PkgIterator const&, APT::VersionContainerInterface::Version const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
+ (c++)"APT::VersionContainerInterface::FromCommandLine(APT::VersionContainerInterface*, pkgCacheFile&, char const**, APT::VersionContainerInterface::Version const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
+ (c++)"APT::VersionContainerInterface::getCandidateVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
+ (c++)"APT::VersionContainerInterface::getInstalledVer(pkgCacheFile&, pkgCache::PkgIterator const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
+ (c++)"APT::VersionContainerInterface::FromModifierCommandLine(unsigned short&, APT::VersionContainerInterface*, pkgCacheFile&, char const*, std::list<APT::VersionContainerInterface::Modifier, std::allocator<APT::VersionContainerInterface::Modifier> > const&, APT::CacheSetHelper&)@Base" 0.8.16~exp9
+ (c++)"EDSP::WriteLimitedScenario(pkgDepCache&, _IO_FILE*, APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > > const&, OpProgress*)@Base" 0.8.16~exp9
+ (c++)"EDSP::WriteScenarioLimitedDependency(pkgDepCache&, _IO_FILE*, pkgCache::PkgIterator const&, pkgCache::VerIterator const&, APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > > const&)@Base" 0.8.16~exp9
+ (c++)"APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator std::max_element<APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator, CompareProviders>(APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator, APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator, CompareProviders)@Base" 0.8.16~exp9
+ (c++)"typeinfo for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::const_iterator@Base" 0.8.16~exp9
+ (c++)"typeinfo for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >@Base" 0.8.16~exp9
+ (c++)"typeinfo for APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >::const_iterator@Base" 0.8.16~exp9
+ (c++)"typeinfo for APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >@Base" 0.8.16~exp9
+ (c++)"typeinfo for APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator@Base" 0.8.16~exp9
+ (c++)"typeinfo for APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >@Base" 0.8.16~exp9
+ (c++)"typeinfo for APT::PackageContainerInterface::const_iterator@Base" 0.8.16~exp9
+ (c++)"typeinfo for APT::PackageContainerInterface@Base" 0.8.16~exp9
+ (c++)"typeinfo for APT::VersionContainerInterface::const_iterator@Base" 0.8.16~exp9
+ (c++)"typeinfo for APT::VersionContainerInterface@Base" 0.8.16~exp9
+ (c++)"typeinfo name for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::const_iterator@Base" 0.8.16~exp9
+ (c++)"typeinfo name for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >@Base" 0.8.16~exp9
+ (c++)"typeinfo name for APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >::const_iterator@Base" 0.8.16~exp9
+ (c++)"typeinfo name for APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >@Base" 0.8.16~exp9
+ (c++)"typeinfo name for APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator@Base" 0.8.16~exp9
+ (c++)"typeinfo name for APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >@Base" 0.8.16~exp9
+ (c++)"typeinfo name for APT::PackageContainerInterface::const_iterator@Base" 0.8.16~exp9
+ (c++)"typeinfo name for APT::PackageContainerInterface@Base" 0.8.16~exp9
+ (c++)"typeinfo name for APT::VersionContainerInterface::const_iterator@Base" 0.8.16~exp9
+ (c++)"typeinfo name for APT::VersionContainerInterface@Base" 0.8.16~exp9
+ (c++)"vtable for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::const_iterator@Base" 0.8.16~exp9
+ (c++)"vtable for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >@Base" 0.8.16~exp9
+ (c++)"vtable for APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >::const_iterator@Base" 0.8.16~exp9
+ (c++)"vtable for APT::PackageContainer<std::list<pkgCache::PkgIterator, std::allocator<pkgCache::PkgIterator> > >@Base" 0.8.16~exp9
+ (c++)"vtable for APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator@Base" 0.8.16~exp9
+ (c++)"vtable for APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >@Base" 0.8.16~exp9
+ (c++)"vtable for APT::PackageContainerInterface::const_iterator@Base" 0.8.16~exp9
+ (c++)"vtable for APT::PackageContainerInterface@Base" 0.8.16~exp9
+ (c++)"vtable for APT::VersionContainerInterface::const_iterator@Base" 0.8.16~exp9
+ (c++)"vtable for APT::VersionContainerInterface@Base" 0.8.16~exp9
+### mixed stuff
+ (c++)"GetListOfFilesInDir(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.8.16~exp13
+ (c++)"pkgCache::DepIterator::IsIgnorable(pkgCache::PkgIterator const&) const@Base" 0.8.16~exp10
+ (c++)"pkgCache::DepIterator::IsIgnorable(pkgCache::PrvIterator const&) const@Base" 0.8.16~exp10
+ (c++)"FileFd::Write(int, void const*, unsigned long long)@Base" 0.8.16~exp14
+ (c++|optional=private)"pkgCacheGenerator::MergeListGroup(pkgCacheGenerator::ListParser&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.16~exp7
+ (c++|optional=private)"pkgCacheGenerator::MergeListPackage(pkgCacheGenerator::ListParser&, pkgCache::PkgIterator&)@Base" 0.8.16~exp7
+ (c++|optional=private)"pkgCacheGenerator::MergeListVersion(pkgCacheGenerator::ListParser&, pkgCache::PkgIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, pkgCache::VerIterator*&)@Base" 0.8.16~exp7
+ (c++|optional=private)"pkgCacheGenerator::AddImplicitDepends(pkgCache::GrpIterator&, pkgCache::PkgIterator&, pkgCache::VerIterator&)@Base" 0.8.16~exp7
+ (c++|optional=private)"pkgCacheGenerator::AddImplicitDepends(pkgCache::VerIterator&, pkgCache::PkgIterator&)@Base" 0.8.16~exp7
+ (c++|optional=internal)"IsDuplicateDescription(pkgCache::DescIterator, HashSumValue<128> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.16~exp7
diff --git a/debian/rules b/debian/rules
index d6c2dfa22..4b9510663 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@
 
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # FOR AUTOCONF 2.52 AND NEWER ONLY
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -18,6 +19,8 @@ endif
 
 ifneq (,$(shell which dpkg-buildflags))
   export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
+  export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+  export CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
 else
   ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
     export CXXFLAGS = -O0 -g -Wall
@@ -31,9 +34,6 @@ build:
 
 PKG=apt
 DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)
-APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' | sed -e 's/\+.*$$//')
-APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in)
-APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g')
 
 # Determine the build directory to use
 BASE=.
@@ -50,19 +50,8 @@ ifeq ($(words $(BLD)),0)
 override BLD := ./build
 endif
 
-# Rebuild configure.in to have the correct version from the change log
-ifneq ($(APT_DEBVER),$(APT_CONFVER))
-ifneq ($(APT_DEBVER),)
-.PHONY: configure.in
-configure.in:
-	sed -e 's/$(APT_CONFVER)/$(APT_DEBVER)/' $@ > $@.$$$$ && mv $@.$$$$ $@
-endif
-else
-configure.in:
-endif
-
 # APT Programs in apt-utils
-APT_UTILS=ftparchive sortpkgs extracttemplates
+APT_UTILS=ftparchive sortpkgs extracttemplates internal-solver
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -70,9 +59,9 @@ APT_UTILS=ftparchive sortpkgs extracttemplates
 # Find the libapt-pkg major version for use in other control files
 include buildlib/libversion.mak
 
-# Determine which package we should provide in the control files
-LIBAPTPKG_PROVIDE=libapt-pkg$(LIBAPTPKG_MAJOR)
-LIBAPTINST_PROVIDE=libapt-inst$(LIBAPTINST_MAJOR)
+# Determine which library package names to use
+LIBAPT_PKG=libapt-pkg$(LIBAPTPKG_MAJOR)
+LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR)
 
 # do not fail as we are just experimenting with symbol files for now
 export DPKG_GENSYMBOLS_CHECK_LEVEL=0
@@ -91,12 +80,16 @@ build/configure-stamp: configure
 	dh_testdir
 	-mkdir build
 	cp COPYING debian/copyright
-	cd build && CXXFLAGS="$(CXXFLAGS)" ../configure $(confflags)
+	cd build && CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" ../configure $(confflags)
 	touch $@
 
 build/build-stamp: build/configure-stamp
 	# Add here commands to compile the package.
 	$(MAKE) binary
+	# compat symlink for the locale split
+	mkdir -p build/usr/share 
+	cd build/usr/share && ln -f -s ../../locale .
+	# compile and run tests
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 	$(MAKE) test
 else
@@ -114,6 +107,11 @@ clean:
 
 	[ ! -f Makefile ] || $(MAKE) clean distclean
 	rm -rf build
+	rm -f debian/$(LIBAPT_PKG).install debian/$(LIBAPT_INST).install \
+	      debian/libapt-pkg-dev.install
+
+debian/%.install: debian/%.install.in
+	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@
 
 binary-indep: apt-doc libapt-pkg-doc
 # Build architecture-independent files here.
@@ -139,7 +137,7 @@ libapt-pkg-doc: build-doc
 	dh_compress -p$@
 	dh_fixperms -p$@
 	dh_installdeb -p$@
-	dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE)
+	dh_gencontrol -p$@
 	dh_md5sums -p$@
 	dh_builddeb -p$@
 
@@ -167,7 +165,7 @@ apt-doc: build-doc
 
 # Build architecture-dependent files here.
 
-binary-arch: apt libapt-pkg-dev apt-utils apt-transport-https
+binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https
 apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list
 apt: build build-doc
 	dh_testdir -p$@
@@ -187,7 +185,7 @@ apt: build build-doc
 	dh_install -p$@ --sourcedir=$(BLD)
 
 	# Remove the bits that are in apt-utils
-	rm $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS))
+	rm $(addprefix debian/$@/usr/bin/apt-,$(APT_UTILS) dump-solver)
 
 	# https has its own package
 	rm debian/$@/usr/lib/apt/methods/https
@@ -207,14 +205,13 @@ apt: build build-doc
 	dh_strip -p$@
 	dh_compress -p$@
 	dh_fixperms -p$@
-	dh_makeshlibs -p$@
 	dh_installdeb -p$@
-	dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib
-	dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE)
+	dh_shlibdeps -p$@
+	dh_gencontrol -p$@
 	dh_md5sums -p$@
 	dh_builddeb -p$@
 
-libapt-pkg-dev: build
+libapt-pkg-dev: build debian/libapt-pkg-dev.install
 	dh_testdir -p$@
 	dh_testroot -p$@
 	dh_prep -p$@
@@ -229,7 +226,7 @@ libapt-pkg-dev: build
 	dh_compress -p$@
 	dh_fixperms -p$@
 	dh_installdeb -p$@
-	dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE)
+	dh_gencontrol -p$@ -- -Vlibapt-pkg-name=$(LIBAPT_PKG) -Vlibapt-inst-name=$(LIBAPT_INST)
 	dh_md5sums -p$@
 	dh_builddeb -p$@
 
@@ -241,8 +238,10 @@ apt-utils: build
 	dh_installdirs -p$@
 
 	cp $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)) debian/$@/usr/bin/
+	cp $(BLD)/bin/apt-dump-solver debian/$@/usr/lib/apt/solvers/dump
 
 	dh_install -p$@ --sourcedir=$(BLD)
+	dh_link -p$@
 	dh_installdocs -p$@
 	dh_installexamples -p$@
 
@@ -255,8 +254,46 @@ apt-utils: build
 	dh_fixperms -p$@
 	dh_makeshlibs -p$@
 	dh_installdeb -p$@
-	dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib
-	dh_gencontrol -p$@ -- -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE)
+	dh_shlibdeps -p$@
+	dh_gencontrol -p$@
+	dh_md5sums -p$@
+	dh_builddeb -p$@
+
+$(LIBAPT_PKG): build debian/$(LIBAPT_PKG).install
+	dh_testdir -p$@
+	dh_testroot -p$@
+	dh_prep -p$@
+	dh_installdirs -p$@
+
+	dh_install -p$@ --sourcedir=$(BLD)
+	dh_installdocs -p$@
+	dh_installchangelogs -p$@
+	dh_strip -p$@
+	dh_compress -p$@
+	dh_fixperms -p$@
+	dh_makeshlibs -p$@
+	dh_installdeb -p$@
+	dh_shlibdeps -p$@ 
+	dh_gencontrol -p$@
+	dh_md5sums -p$@
+	dh_builddeb -p$@
+
+$(LIBAPT_INST): build debian/$(LIBAPT_INST).install
+	dh_testdir -p$@
+	dh_testroot -p$@
+	dh_prep -p$@
+	dh_installdirs -p$@
+
+	dh_install -p$@ --sourcedir=$(BLD)
+	dh_installdocs -p$@
+	dh_installchangelogs -p$@
+	dh_strip -p$@
+	dh_compress -p$@
+	dh_fixperms -p$@
+	dh_makeshlibs -p$@
+	dh_installdeb -p$@
+	dh_shlibdeps -p$@ 
+	dh_gencontrol -p$@
 	dh_md5sums -p$@
 	dh_builddeb -p$@
 
@@ -278,7 +315,7 @@ apt-transport-https: build libapt-pkg-dev
 	dh_compress -p$@
 	dh_fixperms -p$@
 	dh_installdeb -p$@
-	dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib
+	dh_shlibdeps -p$@ 
 	dh_gencontrol -p$@
 	dh_md5sums -p$@
 	dh_builddeb -p$@
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 43d961443..cf79aff85 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -31,7 +31,7 @@ PROJECT_NAME           = @PACKAGE@
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = @VERSION@
+PROJECT_NUMBER         = @PACKAGE_VERSION@
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 1393de015..42d700c82 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -33,34 +33,8 @@
     <refpurpose>query the APT cache</refpurpose>
  </refnamediv>
 
- <!-- Arguments -->
- <refsynopsisdiv>
-   <cmdsynopsis>
-      <command>apt-cache</command>
-      <arg><option>-hvsn</option></arg>
-      <arg><option>-o=<replaceable>config string</replaceable></option></arg>
-      <arg><option>-c=<replaceable>file</replaceable></option></arg>
-      <group choice="req">
-         <arg>gencaches</arg>
-         <arg>showpkg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>showsrc <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>stats</arg>
-         <arg>dump</arg>
-         <arg>dumpavail</arg>
-         <arg>unmet</arg>
-         <arg>search <arg choice="plain"><replaceable>regex</replaceable></arg></arg>
-         <arg>show <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>depends <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>rdepends <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>pkgnames <arg choice="plain"><replaceable>prefix</replaceable></arg></arg>
-         <arg>dotty <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>xvcg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>policy <arg choice="plain" rep="repeat"><replaceable>pkgs</replaceable></arg></arg>
-         <arg>madison <arg choice="plain" rep="repeat"><replaceable>pkgs</replaceable></arg></arg>
-      </group>   
-   </cmdsynopsis>
- </refsynopsisdiv>
- 
+ &synopsis-command-apt-cache;
+
  <refsect1><title>Description</title>
    <para><command>apt-cache</command> performs a variety of operations on APT's package 
    cache. <command>apt-cache</command> does not manipulate the state of the system 
diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml
index 53ab392ab..94fc6fd8b 100644
--- a/doc/apt-cdrom.8.xml
+++ b/doc/apt-cdrom.8.xml
@@ -32,20 +32,7 @@
     <refpurpose>APT CDROM management utility</refpurpose>
  </refnamediv>
 
- <!-- Arguments -->
- <refsynopsisdiv>
-   <cmdsynopsis>
-      <command>apt-cdrom</command>
-      <arg><option>-hvrmfan</option></arg>
-      <arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg>
-      <arg><option>-o=<replaceable>config string</replaceable></option></arg>
-      <arg><option>-c=<replaceable>file</replaceable></option></arg>
-      <group>
-         <arg>add</arg>
-         <arg>ident</arg>
-      </group>   
-   </cmdsynopsis>
- </refsynopsisdiv>
+ &synopsis-command-apt-cdrom;
 
  <refsect1><title>Description</title>
    <para><command>apt-cdrom</command> is used to add a new CDROM to APTs list
diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml
index 862a034a1..b6fcf4bf2 100644
--- a/doc/apt-config.8.xml
+++ b/doc/apt-config.8.xml
@@ -33,20 +33,8 @@
     <refpurpose>APT Configuration Query program</refpurpose>
  </refnamediv>
 
- <!-- Arguments -->
- <refsynopsisdiv>
-   <cmdsynopsis>
-      <command>apt-config</command>
-      <arg><option>-hv</option></arg>
-      <arg><option>-o=<replaceable>config string</replaceable></option></arg>
-      <arg><option>-c=<replaceable>file</replaceable></option></arg>
-      <group choice="req">
-         <arg>shell</arg>
-         <arg>dump</arg>
-      </group>   
-   </cmdsynopsis>
- </refsynopsisdiv>
- 
+ &synopsis-command-apt-config;
+
  <refsect1><title>Description</title>
    <para><command>apt-config</command> is an internal program used by various
    portions of the APT suite to provide consistent configurability. It accesses
diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml
index af4cacfce..8f28f8c54 100644
--- a/doc/apt-extracttemplates.1.xml
+++ b/doc/apt-extracttemplates.1.xml
@@ -33,16 +33,8 @@
     <refpurpose>Utility to extract DebConf config and templates from Debian packages</refpurpose>
  </refnamediv>
 
- <!-- Arguments -->
- <refsynopsisdiv>
-   <cmdsynopsis>
-      <command>apt-extracttemplates</command>
-      <arg><option>-hv</option></arg>
-      <arg><option>-t=<replaceable>temporary directory</replaceable></option></arg>
-      <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg>
-   </cmdsynopsis>
- </refsynopsisdiv>
- 
+ &synopsis-command-apt-extracttemplates;
+
  <refsect1><title>Description</title>
    <para><command>apt-extracttemplates</command> will take one or more Debian package files
    as input and write out (to a temporary directory) all associated config
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index b08ebe80f..93b109af1 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -33,29 +33,8 @@
     <refpurpose>Utility to generate index files</refpurpose>
  </refnamediv>
 
- <!-- Arguments -->
- <refsynopsisdiv>
-   <cmdsynopsis>
-      <command>apt-ftparchive</command>
-      <arg><option>-hvdsq</option></arg>
-      <arg><option>--md5</option></arg>
-      <arg><option>--delink</option></arg>
-      <arg><option>--readonly</option></arg>
-      <arg><option>--contents</option></arg>
-      <arg><option>--arch <replaceable>architecture</replaceable></option></arg>
-      <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</replaceable></option></arg>
-      <arg><option>-c=<replaceable>file</replaceable></option></arg>      
-      <group choice="req">
-         <arg>packages<arg choice="plain" rep="repeat"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg>
-         <arg>sources<arg choice="plain" rep="repeat"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg>
-         <arg>contents <arg choice="plain"><replaceable>path</replaceable></arg></arg>
-         <arg>release <arg choice="plain"><replaceable>path</replaceable></arg></arg>
-         <arg>generate <arg choice="plain"><replaceable>config-file</replaceable></arg> <arg choice="plain" rep="repeat"><replaceable>section</replaceable></arg></arg>
-         <arg>clean <arg choice="plain"><replaceable>config-file</replaceable></arg></arg>
-      </group>
-   </cmdsynopsis>
- </refsynopsisdiv>
- 
+ &synopsis-command-apt-ftparchive;
+
  <refsect1><title>Description</title>
    <para><command>apt-ftparchive</command> is the command line tool that generates the index 
    files that APT uses to access a distribution source. The index files should 
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index b1e4bf975..65929e733 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -33,91 +33,8 @@
     <refpurpose>APT package handling utility -- command-line interface</refpurpose>
  </refnamediv>
 
- <!-- Arguments -->
- <refsynopsisdiv>
-   <cmdsynopsis>
-      <command>apt-get</command>
-      <arg><option>-sqdyfmubV</option></arg>
-      <arg>
-	      <option>-o=
-			  <replaceable>config_string</replaceable>
-	      </option>
-      </arg>
-      <arg>
-	      <option>-c=
-		      <replaceable>config_file</replaceable>
-	      </option>
-      </arg>
-      <arg>
-		<option>-t=</option>
-		<arg choice='plain'>
-			<replaceable>target_release</replaceable>
-		</arg>
-      </arg>
-      <arg>
-		<option>-a=</option>
-		<arg choice='plain'>
-			<replaceable>default_architecture</replaceable>
-		</arg>
-      </arg>
-
-
-      <group choice="req">
-         <arg choice='plain'>update</arg>
-         <arg choice='plain'>upgrade</arg>
-         <arg choice='plain'>dselect-upgrade</arg>
-         <arg choice='plain'>dist-upgrade</arg>
-         <arg choice='plain'>install 
-			 <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable>
-				<arg>
-					<group choice='req'>
-						<arg choice='plain'>
-							=<replaceable>pkg_version_number</replaceable>
-						</arg>
-						<arg choice='plain'>
-							/<replaceable>target_release</replaceable>
-						</arg>
-					</group>
-				</arg>
-			 </arg>
-	     </arg>
-         <arg choice='plain'>remove <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg choice='plain'>purge <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg choice='plain'>source 
-			 <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable>
-				<arg>
-					<group choice='req'>
-						<arg choice='plain'>
-							=<replaceable>pkg_version_number</replaceable>
-						</arg>
-						<arg choice='plain'>
-							/<replaceable>target_release</replaceable>
-						</arg>
-					</group>
-				</arg>
-			 </arg>
-	     </arg>
-         <arg choice='plain'>build-dep <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg choice='plain'>check</arg>
-         <arg choice='plain'>clean</arg>
-         <arg choice='plain'>autoclean</arg>
-         <arg choice='plain'>autoremove</arg>
-		 <arg choice='plain'>
-			 <group choice='req'>
-				<arg choice='plain'>-v</arg>
-				<arg choice='plain'>--version</arg>
-			 </group>
-		 </arg>
-		 <arg choice='plain'>
-			 <group choice='req'>
-				<arg choice='plain'>-h</arg>
-				<arg choice='plain'>--help</arg>
-			 </group>
-		 </arg>
-      </group>   
-   </cmdsynopsis>
- </refsynopsisdiv>
- 
+ &synopsis-command-apt-get;
+
  <refsect1><title>Description</title>
    <para><command>apt-get</command> is the command-line tool for handling packages, and may be 
    considered the user's "back-end" to other tools using the APT
@@ -433,6 +350,11 @@
      Configuration Item: <literal>APT::Get::Assume-Yes</literal>.</para></listitem>
      </varlistentry>
 
+     <varlistentry><term><option>--assume-no</option></term>
+     <listitem><para>Automatic "no" to all prompts.
+     Configuration Item: <literal>APT::Get::Assume-No</literal>.</para></listitem>
+     </varlistentry>
+
      <varlistentry><term><option>-u</option></term><term><option>--show-upgraded</option></term>
      <listitem><para>Show upgraded packages; Print out a list of all packages that are to be
      upgraded. 
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index cae2b00a0..3748b5e17 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -25,15 +25,7 @@
     <refpurpose>APT key management utility</refpurpose>
  </refnamediv>
 
- <!-- Arguments -->
- <refsynopsisdiv>
-   <cmdsynopsis>
-      <command>apt-key</command>
-      <arg><option>--keyring <replaceable>filename</replaceable></option></arg>
-      <arg><replaceable>command</replaceable></arg>
-      <arg rep="repeat"><option><replaceable>arguments</replaceable></option></arg>
-   </cmdsynopsis>
- </refsynopsisdiv>
+ &synopsis-command-apt-key;
 
  <refsect1><title>Description</title>
    <para>
@@ -45,19 +37,19 @@
 
 <refsect1><title>Commands</title>
    <variablelist>
-     <varlistentry><term>add <replaceable>filename</replaceable></term>
+     <varlistentry><term>add &synopsis-param-filename;</term>
      <listitem>
      <para>
 
        Add a new key to the list of trusted keys.  The key is read
-       from <replaceable>filename</replaceable>, or standard input if
-       <replaceable>filename</replaceable> is <literal>-</literal>.
+       from &synopsis-param-filename;, or standard input if
+       &synopsis-param-filename; is <literal>-</literal>.
      </para>
 
      </listitem>
      </varlistentry>
 
-     <varlistentry><term>del <replaceable>keyid</replaceable></term>
+     <varlistentry><term>del &synopsis-param-keyid;</term>
      <listitem>
      <para>
 
@@ -68,11 +60,11 @@
      </listitem>
      </varlistentry>
 
-     <varlistentry><term>export <replaceable>keyid</replaceable></term>
+     <varlistentry><term>export &synopsis-param-keyid;</term>
      <listitem>
      <para>
 
-        Output the key <replaceable>keyid</replaceable> to standard output.
+        Output the key &synopsis-param-keyid; to standard output.
 
      </para>
 
@@ -161,7 +153,7 @@
  <refsect1><title>Options</title>
 <para>Note that options need to be defined before the commands described in the previous section.</para>
    <variablelist>
-      <varlistentry><term>--keyring <replaceable>filename</replaceable></term>
+      <varlistentry><term>--keyring &synopsis-param-filename;</term>
       <listitem><para>With this option it is possible to specify a specific keyring
       file the command should operate on. The default is that a command is executed
       on the <filename>trusted.gpg</filename> file as well as on all parts in the
diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml
index 01c8665dd..d62731124 100644
--- a/doc/apt-mark.8.xml
+++ b/doc/apt-mark.8.xml
@@ -33,26 +33,8 @@
     <refpurpose>mark/unmark a package as being automatically-installed</refpurpose>
  </refnamediv>
 
- <!-- Arguments -->
- <refsynopsisdiv>
-   <cmdsynopsis>
-	<command>apt-mark</command>
-	<arg><option>-hv</option></arg>
-	<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg>
-	<group choice="plain">
-		<arg choice="plain">
-			<group choice="req">
-				<arg choice="plain">auto</arg>
-				<arg choice="plain">manual</arg>
-				<arg choice="plain">showauto</arg>
-				<arg choice="plain">showmanual</arg>
-			</group>
-			<arg choice="plain" rep="repeat"><replaceable>package</replaceable></arg>
-		</arg>
-	</group>
-   </cmdsynopsis>
- </refsynopsisdiv>
- 
+ &synopsis-command-apt-mark;
+
  <refsect1><title>Description</title>
    <para><command>apt-mark</command> will change whether a package has
    been marked as being automatically installed.
diff --git a/doc/apt-sortpkgs.1.xml b/doc/apt-sortpkgs.1.xml
index f2bd3c3ea..c1d1aa1e1 100644
--- a/doc/apt-sortpkgs.1.xml
+++ b/doc/apt-sortpkgs.1.xml
@@ -33,17 +33,8 @@
     <refpurpose>Utility to sort package index files</refpurpose>
  </refnamediv>
 
- <!-- Arguments -->
- <refsynopsisdiv>
-   <cmdsynopsis>
-      <command>apt-sortpkgs</command>
-      <arg><option>-hvs</option></arg>
-      <arg><option>-o=<replaceable>config string</replaceable></option></arg>
-      <arg><option>-c=<replaceable>file</replaceable></option></arg>
-      <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg>
-   </cmdsynopsis>
- </refsynopsisdiv>
- 
+ &synopsis-command-apt-sortpkgs;
+
  <refsect1><title>Description</title>
    <para><command>apt-sortpkgs</command> will take an index file (Source index or Package 
    index) and sort the records so that they are ordered by the package name. 
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 14cd70e89..ad4554e2f 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -192,3 +192,158 @@
 <!ENTITY oldstable-codename "lenny">
 <!ENTITY stable-codename "squeeze">
 <!ENTITY testing-codename "wheezy">
+
+
+<!-- Arguments -->
+<!ENTITY synopsis-arg-option "<arg><option>-o=<replaceable>&synopsis-config-string;</replaceable></option></arg>">
+<!ENTITY synopsis-arg-config "<arg><option>-c=<filename><replaceable>&synopsis-config-file;</replaceable></filename></option></arg>">
+<!ENTITY synopsis-arg-target-release "<arg><option>-t=<replaceable>&synopsis-target-release;</replaceable></option></arg>">
+<!ENTITY synopsis-arg-architecture "<arg><option>-a=<replaceable>&synopsis-architecture;</replaceable></option></arg>">
+<!ENTITY synopsis-arg-pkgver "<arg choice='plain' rep='repeat'><replaceable>&synopsis-pkg;</replaceable><arg><group choice='req'>
+	<arg choice='plain'>=<replaceable>&synopsis-pkg-ver-number;</replaceable></arg>
+	<arg choice='plain'>/<replaceable>&synopsis-target-release;</replaceable></arg>
+</group></arg></arg>">
+<!ENTITY synopsis-arg-pkg "<arg choice='plain' rep='repeat'><replaceable>&synopsis-pkg;</replaceable></arg>">
+<!ENTITY synopsis-param-filename "<filename><replaceable>&synopsis-filename;</replaceable></filename>">
+<!ENTITY synopsis-help "<arg choice='plain'><group choice='req'><arg choice='plain'>-v</arg><arg choice='plain'>--version</arg></group></arg>
+	<arg choice='plain'><group choice='req'><arg choice='plain'>-h</arg><arg choice='plain'>--help</arg></group></arg>">
+<!ENTITY synopsis-command-apt-get "<refsynopsisdiv><cmdsynopsis>
+	<command>apt-get</command>
+	<arg><option>-asqdyfmubV</option></arg>
+	&synopsis-arg-option;
+	&synopsis-arg-config;
+	&synopsis-arg-target-release;
+	&synopsis-arg-architecture;
+	<group choice='req'>
+		<arg choice='plain'>update</arg>
+		<arg choice='plain'>upgrade</arg>
+		<arg choice='plain'>dselect-upgrade</arg>
+		<arg choice='plain'>dist-upgrade</arg>
+		<arg choice='plain'>install &synopsis-arg-pkgver;</arg>
+		<arg choice='plain'>remove &synopsis-arg-pkg;</arg>
+		<arg choice='plain'>purge &synopsis-arg-pkg;</arg>
+		<arg choice='plain'>source &synopsis-arg-pkgver;</arg>
+		<arg choice='plain'>build-dep &synopsis-arg-pkgver;</arg>
+		<arg choice='plain'>download &synopsis-arg-pkgver;</arg>
+		<arg choice='plain'>check</arg>
+		<arg choice='plain'>clean</arg>
+		<arg choice='plain'>autoclean</arg>
+		<arg choice='plain'>autoremove</arg>
+		&synopsis-help;
+	</group>
+</cmdsynopsis></refsynopsisdiv>">
+<!ENTITY synopsis-command-apt-cache "<refsynopsisdiv><cmdsynopsis>
+	<command>apt-cache</command>
+	<arg><option>-agipns</option></arg>
+	&synopsis-arg-option;
+	&synopsis-arg-config;
+	<group choice='req'>
+		<arg choice='plain'>gencaches</arg>
+		<arg choice='plain'>showpkg &synopsis-arg-pkg;</arg>
+		<arg choice='plain'>showsrc &synopsis-arg-pkg;</arg>
+		<arg choice='plain'>stats</arg>
+		<arg choice='plain'>dump</arg>
+		<arg choice='plain'>dumpavail</arg>
+		<arg choice='plain'>unmet</arg>
+		<arg choice='plain'>search <arg choice='plain' rep='repeat'><replaceable>&synopsis-regex;</replaceable></arg></arg>
+		<arg choice='plain'>show &synopsis-arg-pkgver;</arg>
+		<arg choice='plain'>depends &synopsis-arg-pkgver;</arg>
+		<arg choice='plain'>rdepends &synopsis-arg-pkgver;</arg>
+		<arg choice='plain'>pkgnames <arg choice='plain'><replaceable>&synopsis-prefix;</replaceable></arg></arg>
+		<arg choice='plain'>dotty &synopsis-arg-pkgver;</arg>
+		<arg choice='plain'>xvcg &synopsis-arg-pkgver;</arg>
+		<arg choice='plain'>policy &synopsis-arg-pkg;</arg>
+		<arg choice='plain'>madison &synopsis-arg-pkg;</arg>
+		&synopsis-help;
+	</group>
+</cmdsynopsis></refsynopsisdiv>">
+<!ENTITY synopsis-command-apt-cdrom "<refsynopsisdiv><cmdsynopsis>
+	<command>apt-cdrom</command>
+	<arg><option>-rmfan</option></arg>
+	<arg><option>-d=<replaceable>&synopsis-cdrom-mount;</replaceable></option></arg>
+	&synopsis-arg-option;
+	&synopsis-arg-config;
+	<group choice='req'>
+		<arg choice='plain'>add</arg>
+		<arg choice='plain'>ident</arg>
+		&synopsis-help;
+	</group>
+</cmdsynopsis></refsynopsisdiv>">
+<!ENTITY synopsis-command-apt-config "<refsynopsisdiv><cmdsynopsis>
+	<command>apt-config</command>
+	&synopsis-arg-option;
+	&synopsis-arg-config;
+	<group choice='req'>
+		<arg choice='plain'>shell</arg>
+		<arg choice='plain'>dump</arg>
+		&synopsis-help;
+	</group>
+</cmdsynopsis></refsynopsisdiv>">
+<!ENTITY synopsis-command-apt-extracttemplates "<refsynopsisdiv><cmdsynopsis>
+	<command>apt-extracttemplates</command>
+	<arg><option>-t=<replaceable>&synopsis-tmp-directory;</replaceable></option></arg>
+	<arg choice='plain' rep='repeat'>&synopsis-param-filename;</arg>
+	&synopsis-help;
+</cmdsynopsis></refsynopsisdiv>">
+<!ENTITY synopsis-arg-ftparchive "<arg choice='plain' rep='repeat'><replaceable>&synopsis-path;</replaceable></arg><arg><filename><replaceable>&synopsis-override;</replaceable></filename><arg><replaceable>&synopsis-pathprefix;</replaceable></arg></arg>">
+<!ENTITY synopsis-command-apt-ftparchive "<refsynopsisdiv><cmdsynopsis>
+	<command>apt-ftparchive</command>
+	<arg><option>-dsq</option></arg>
+	<arg><option>--md5</option></arg>
+	<arg><option>--delink</option></arg>
+	<arg><option>--readonly</option></arg>
+	<arg><option>--contents</option></arg>
+	<arg><option>--arch <replaceable>architecture</replaceable></option></arg>
+	&synopsis-arg-option;
+	&synopsis-arg-config;
+	<group choice='req'>
+		<arg choice='plain'>packages &synopsis-arg-ftparchive;</arg>
+		<arg choice='plain'>sources &synopsis-arg-ftparchive;</arg>
+		<arg choice='plain'>contents <arg choice='plain'><replaceable>&synopsis-path;</replaceable></arg></arg>
+		<arg choice='plain'>release <arg choice='plain'><replaceable>&synopsis-path;</replaceable></arg></arg>
+		<arg choice='plain'>generate <arg choice='plain'><replaceable>&synopsis-config-file;</replaceable></arg> <arg choice='plain' rep='repeat'><replaceable>&synopsis-section;</replaceable></arg></arg>
+		<arg choice='plain'>clean <arg choice='plain'><replaceable>&synopsis-config-file;</replaceable></arg></arg>
+		&synopsis-help;
+	</group>
+</cmdsynopsis></refsynopsisdiv>">
+<!ENTITY synopsis-param-keyid "<replaceable>&synopsis-keyid;</replaceable>">
+<!ENTITY synopsis-command-apt-key "<refsynopsisdiv><cmdsynopsis>
+	<command>apt-key</command>
+	<arg><option>--keyring &synopsis-param-filename;</option></arg>
+	<group choice='req'>
+		<arg choice='plain'>add &synopsis-param-filename;</arg>
+		<arg choice='plain'>del &synopsis-param-keyid;</arg>
+		<arg choice='plain'>export &synopsis-param-keyid;</arg>
+		<arg choice='plain'>exportall</arg>
+		<arg choice='plain'>list</arg>
+		<arg choice='plain'>finger</arg>
+		<arg choice='plain'>adv</arg>
+		<arg choice='plain'>update</arg>
+		<arg choice='plain'>net-update</arg>
+		&synopsis-help;
+	</group>
+</cmdsynopsis></refsynopsisdiv>">
+<!ENTITY synopsis-command-apt-mark "<refsynopsisdiv><cmdsynopsis>
+	<command>apt-mark</command>
+	<arg><option>-f=&synopsis-param-filename;</option></arg>
+	<group choice='plain'>
+		<arg choice='plain'>
+			<group choice='req'>
+				<arg choice='plain'>auto</arg>
+				<arg choice='plain'>manual</arg>
+				<arg choice='plain'>showauto</arg>
+				<arg choice='plain'>showmanual</arg>
+			</group>
+			&synopsis-arg-pkg;
+		</arg>
+		&synopsis-help;
+	</group>
+</cmdsynopsis></refsynopsisdiv>">
+<!ENTITY synopsis-command-apt-sortpkgs "<refsynopsisdiv><cmdsynopsis>
+	<command>apt-sortpkgs</command>
+	<arg><option>-s</option></arg>
+	&synopsis-arg-option;
+	&synopsis-arg-config;
+	<arg choice='plain' rep='repeat'>&synopsis-param-filename;</arg>
+	&synopsis-help;
+</cmdsynopsis></refsynopsisdiv>">
diff --git a/doc/apt.ent b/doc/apt.ent
index fc745989f..e48087fa7 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -208,3 +208,46 @@
      This is done on purpose, to avoid losing content when the
      translation is lagging behind the original content.
 ">
+
+<!-- TRANSLATOR: used as in -o=config_string  e.g. -o=Debug::pkgProblemResolver=1 -->
+<!ENTITY synopsis-config-string "config_string">
+
+<!-- TRANSLATOR: used as in -c=config_file  e.g. -c=./apt.conf -->
+<!ENTITY synopsis-config-file "config_file">
+
+<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release  e.g. -t=squeeze apt/experimental -->
+<!ENTITY synopsis-target-release "target_release">
+
+<!-- TRANSLATOR: used as in -a=architecture  e.g. -a=armel -->
+<!ENTITY synopsis-architecture "architecture">
+
+<!-- TRANSLATOR: used as in apt-get install pkg  e.g. apt-get install awesome -->
+<!ENTITY synopsis-pkg "pkg">
+
+<!-- TRANSLATOR: used as in pkg=pkg_version_number  e.g. apt=0.8.15 -->
+<!ENTITY synopsis-pkg-ver-number "pkg_version_number">
+
+<!-- TRANSLATOR: used as in apt-cache pkgnames prefix  e.g. apt-cache pkgnames apt -->
+<!ENTITY synopsis-prefix "prefix">
+
+<!-- TRANSLATOR: used as in apt-cache search regex  e.g. apt-cache search awesome -->
+<!ENTITY synopsis-regex "regex">
+
+<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point  e.g. apt-cdrom -d=/media/cdrom -->
+<!ENTITY synopsis-cdrom-mount "cdrom_mount_point">
+
+<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory  e.g. apt-extracttemplates -t=/tmp -->
+<!ENTITY synopsis-tmp-directory "temporary_directory">
+
+<!-- TRANSLATOR: used as in apt-extracttemplates filename -->
+<!ENTITY synopsis-filename "filename">
+
+<!-- TRANSLATOR: used as parameters for apt-ftparchive  e.g. apt-ftparchive packages path override pathprefix -->
+<!ENTITY synopsis-path "path">
+<!ENTITY synopsis-pathprefix "pathprefix">
+<!ENTITY synopsis-section "section">
+<!ENTITY synopsis-override "override">
+
+<!-- TRANSLATOR: used as in apt-key export keyid  e.g. apt-key export 473041FA -->
+<!ENTITY synopsis-keyid "keyid">
+
diff --git a/doc/external-dependency-solver-protocol.txt b/doc/external-dependency-solver-protocol.txt
new file mode 100644
index 000000000..7a124d8f9
--- /dev/null
+++ b/doc/external-dependency-solver-protocol.txt
@@ -0,0 +1,299 @@
+# APT External Dependency Solver Protocol (EDSP) - version 0.4
+
+This document describes the communication protocol between APT and
+external dependency solvers. The protocol is called APT EDSP, for "APT
+External Dependency Solver Protocol".
+
+
+## Components
+
+- **APT**: we know this one.
+- APT is equipped with its own **internal solver** for dependencies,
+  which is identified by the string `internal`.
+- **External solver**: an *external* software component able to resolve
+  dependencies on behalf of APT.
+  
+At each interaction with APT, a single solver is in use.  When there is
+a total of 2 or more solvers, internals or externals, the user can
+choose which one to use.
+
+Each solver is identified by an unique string, the **solver
+name**. Solver names must be formed using only alphanumeric ASCII
+characters, dashes, and underscores; solver names must start with a
+lowercase ASCII letter. The special name `internal` denotes APT's
+internal solver, is reserved, and cannot be used by external solvers.
+
+
+## Installation
+
+Each external solver is installed as a file under Dir::Bin::Solvers (see
+below), which defaults to `/usr/lib/apt/solvers`. We will assume in the
+remainder of this section that such a default value is in effect.
+
+The naming scheme is `/usr/lib/apt/solvers/NAME`, where `NAME` is the
+name of the external solver.
+
+Each file under `/usr/lib/apt/solvers` corresponding to an external
+solver must be executable.
+
+No non-solver files must be installed under `/usr/lib/apt/solvers`, so
+that an index of available external solvers can be obtained by listing
+the content of that directory.
+
+
+## Configuration
+
+Several APT options can be used to affect dependency solving in APT. An
+overview of them is given below. Please refer to proper APT
+configuration documentation for more, and more up to date, information.
+
+- **APT::Solver**: the name of the solver to be used for
+  dependency solving. Defaults to `internal`
+
+- **APT::Solver::Strict-Pinning**: whether pinning must be strictly
+  respected (as the internal solver does) or can be slightly deviated
+  from. Defaults to `yes`.
+
+- **APT::Solver::NAME::Preferences** (where NAME is a solver name):
+  solver-specific user preference string used during dependency solving,
+  when the solver NAME is in use. Check solver-specific documentation
+  for what is supported here. Defaults to the empty string.
+
+- **Dir::Bin::Solvers**: absolute path of the directory where to look for
+  external solvers. Defaults to `/usr/lib/apt/solvers`.
+
+## Protocol
+
+When configured to use an external solver, APT will resort to it to
+decide which packages should be installed or removed.
+
+The interaction happens **in batch**: APT will invoke the external
+solver passing the current status of installed and available packages,
+as well as the user request to alter the set of installed packages. The
+external solver will compute a new complete set of installed packages
+and gives APT a "diff" listing of which *additional* packages should be
+installed and of which currently installed packages should be
+*removed*. (Note: the order in which those actions have to be performed
+will be up to APT to decide.)
+
+External solvers are invoked by executing them. Communications happens
+via the file descriptors: **stdin** (standard input) and **stdout**
+(standard output). stderr is not used by the EDSP protocol. Solvers can
+therefore use stderr to dump debugging information that could be
+inspected separately.
+
+After invocation, the protocol passes through a sequence of phases:
+
+1. APT invokes the external solver
+2. APT send to the solver a dependency solving **scenario**
+3. The solver solves dependencies. During this phase the solver may
+   send, repeatedly, **progress** information to APT.
+4. The solver sends back to APT an **answer**, i.e. either a *solution*
+   or an *error* report.
+5. The external solver exits
+
+
+### Scenario
+
+A scenario is a text file encoded in a format very similar to the "Deb
+822" format (AKA "the format used by Debian `Packages` files"). A
+scenario consists of two distinct parts: a **request** and a **package
+universe**, occurring in that order. The request consists of a single
+Deb 822 stanza, while the package universe consists of several such
+stanzas. All stanzas occurring in a scenario are separated by an empty
+line.
+
+
+#### Request
+
+Within a dependency solving scenario, a request represents the action on
+installed packages requested by the user.
+
+A request is a single Deb 822 stanza opened by a mandatory Request field
+and followed by a mixture of action and preference fields.
+
+The value of the **Request:** field is a string describing the EDSP
+protocol which will be used to communicate. At present, the string must
+be `EDSP 0.4`.
+
+a unique request identifier, such as an
+UUID. Request fields are mainly used to identify the beginning of a
+request stanza; their actual values are otherwise not used by the EDSP
+protocol.
+
+The following **action fields** are supported in request stanzas:
+
+- **Install:** (optional, defaults to the empty string) A space
+  separated list of package names, with *no version attached*, to
+  install. This field denotes a list of packages that the user wants to
+  install, usually via an APT `install` request.
+
+- **Remove:** (optional, defaults to the empty string) Same syntax of
+  Install. This field denotes a list of packages that the user wants to
+  remove, usually via APT `remove` or `purge` requests.
+
+- **Upgrade:** (optional, defaults to `no`). Allowed values: `yes`,
+  `no`. When set to `yes`, an upgrade of all installed packages has been
+  requested, usually via an APT `upgrade` request.
+
+- **Dist-Upgrade:** (optional, defaults to `no`). Allowed values: `yes`,
+  `no`. Same as Upgrade, but for APT `dist-upgrade` requests.
+
+- **Autoremove:** (optional, defaults to `no`). Allowed values: `yes`,
+  `no`. When set to `yes`, a clean up of unused automatically installed
+  packages has been requested, usually via an APT `autoremove` request.
+
+The following **preference fields** are supported in request stanzas:
+
+- **Strict-Pinning:** (optional, defaults to `yes`). Allowed values:
+  `yes`, `no`. When set to `yes`, APT pinning is strict, in the sense
+  that the solver must not propose to install packages which are not APT
+  candidates (see the `APT-Pin` and `APT-Candidate` fields in the
+  package universe). When set to `no`, the solver does only a best
+  effort attempt to install APT candidates. Usually, the value of this
+  field comes from the `APT::Solver::Strict-Pinning` configuration
+  option.
+
+- **Preferences:** a solver-specific optimization string, usually coming
+  from the `APT::Solver::Preferences` configuration option.
+
+
+#### Package universe
+
+A package universe is a list of Deb 822 stanzas, one per package, called
+**package stanzas**. Each package stanzas starts with a Package
+field. The following fields are supported in package stanzas:
+
+- All fields contained in the dpkg database, with the exception of
+  fields marked as "internal" (see the manpage `dpkg-query (1)`). Among
+  those fields, the following are mandatory for all package stanzas:
+  Package, Version, Architecture.
+  
+  It is recommended not to pass the Description field to external
+  solvers or, alternatively, to trim it to the short description only.
+
+- **Installed:** (optional, defaults to `no`). Allowed values: `yes`,
+  `no`. When set to `yes`, the corresponding package is currently
+  installed.
+  
+  Note: the Status field present in the dpkg database must not be passed
+  to the external solver, as it's an internal dpkg field. Installed and
+  other fields permit to encode the most relevant aspects of Status in
+  communications with solvers.
+
+- **Hold:** (optional, defaults to `no`). Allowed values: `yes`,
+  `no`. When set to `yes`, the corresponding package is marked as "on
+  hold" by dpkg.
+
+- **APT-ID:** (mandatory). Unique package identifier, according to APT.
+
+- **APT-Pin:** (mandatory). Must be an integer. Package pin value,
+  according to APT policy.
+
+- **APT-Candidate:** (optional, defaults to `no`). Allowed values:
+  `yes`, `no`. When set to `yes`, the corresponding package is the APT
+  candidate for installation among all available packages with the same
+  name.
+
+- **APT-Automatic:** (optional, defaults to `no`). Allowed values:
+  `yes`, `no`. When set to `yes`, the corresponding package is marked by
+  APT as automatic installed. Note that automatic installed packages
+  should be removed by the solver only when the Autoremove action is
+  requested (see Request section).
+
+### Answer
+
+An answer from the external solver to APT is either a *solution* or an
+*error*.
+
+The following invariant on **exit codes** must hold true. When the
+external solver is *able to find a solution*, it will write the solution
+to standard output and then exit with an exit code of 0. When the
+external solver is *unable to find a solution* (and s aware of that), it
+will write an error to standard output and then exit with an exit code
+of 0. An exit code other than 0 will be interpreted as a solver crash
+with no meaningful error about dependency resolution to convey to the
+user.
+
+
+#### Solution
+
+A solution is a list of Deb 822 stanzas. Each of them could be an
+install stanza (telling APT to install a specific package), a remove
+stanza (telling APT to remove one), or an autoremove stanza (telling APT
+about the *future* possibility of removing a package using the
+Autoremove action).
+
+An **install stanza** starts with an Install field and supports the
+following fields:
+
+- **Install:** (mandatory). The value is a package identifier,
+  referencing one of the package stanzas of the package universe via its
+  APT-ID field.
+
+- All fields supported by package stanzas.
+
+**Remove stanzas** are similar to install stanzas, but have **Remove**
+fields instead of Install fields.
+
+**Autoremove stanzas** are similar to install stanzas, but have
+**Autoremove** fields instead of Install fields. Autoremove stanzas
+should be output so that APT can inform the user of which packages they
+can now autoremove, as a consequence of the executed action. However,
+this protocol makes no assumption on the fact that a subsequent
+invocation of an Autoremove action will actually remove the very same
+packages indicated by Autoremove stanzas in the former solution.
+
+In terms of expressivity, install and remove stanzas can carry one
+single field each, as APT-IDs are enough to pinpoint packages to be
+installed/removed. Nonetheless, for protocol readability, it is
+recommended that solvers either add unconditionally the fields Package,
+Version, and Architecture to all install/remove stanzas or,
+alternatively, that they support a `--verbose` command line flag that
+explicitly enables the output of those fields in solutions.
+
+
+#### Error
+
+An error is a single Deb 822 stanza, starting the field Error. The
+following fields are supported in error stanzas:
+
+- **Error:** (mandatory). The value of this field is ignored, although
+  it should be a unique error identifier, such as a UUID.
+
+- **Message:** (mandatory). The value of this field is a text string,
+  meant to be read by humans, that explains the cause of the solver
+  error. Message fields might be multi-line, like the Description field
+  in the dpkg database. The first line conveys a short message, which
+  can be explained in more details using subsequent lines.
+
+
+### Progress
+
+During dependency solving, an external solver may send progress
+information to APT using **progress stanzas**. A progress stanza starts
+with the Progress field and might contain the following fields:
+
+- **Progress:** (mandatory). The value of this field is a date and time
+  timestamp, in RFC 2822 format. The timestamp provides a time
+  annotation for the progress report.
+
+- **Percentage:** (optional). An integer from 0 to 100, representing the
+  completion of the dependency solving process, as declared by the
+  solver.
+
+- **Message:** (optional). A textual message, meant to be read by the
+  APT user, telling what is going on within the dependency solving
+  (e.g. the current phase of dependency solving, as declared by the
+  solver).
+
+
+# Future extensions
+
+Potential future extensions to this protocol, listed in no specific
+order, include:
+
+- fixed error types to identify common failures across solvers and
+  enable APT to translate error messages
+- structured error data to explain failures in terms of packages and
+  dependencies
diff --git a/doc/makefile b/doc/makefile
index 4fcf3bd10..df2ddb25f 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -15,7 +15,7 @@ include $(DEBIANDOC_H)
 ifdef XSLTPROC
 # generate a list of accepted man page translations
 SOURCE = $(patsubst %.xml,%,$(wildcard *.?.xml))
-INCLUDES = apt.ent
+INCLUDES = apt.ent apt-verbatim.ent
 STYLESHEET=manpage-style.xsl
 
 LOCAL := manpage-$(firstword $(SOURCE))
@@ -67,26 +67,21 @@ veryclean-subdirs:
 		rm -rf $$dir; \
 	done
 
+.PHONY: update-po po4a stats
+
 ifdef PO4A
 doc: po4a
 
-clean: po4a-clean
-
-.PHONY: update-po po4a stats
 update-po:
 	po4a --previous --no-backups --force --no-translations po4a.conf
 
-po4a-clean:
-	po4a --previous --rm-backups --rm-translations po4a.conf
-
 po4a:
 	po4a --previous --no-backups po4a.conf
+endif
 
 stats:
 	for i in po/*.po; do echo -n "$$i: "; msgfmt --statistics $$i; done
 
-endif
-
 ifdef DOXYGEN
 DOXYGEN_SOURCES = $(shell find $(BASE)/apt-pkg -not -name .\\\#* -and \( -name \*.cc -or -name \*.h \) )
 
@@ -96,9 +91,6 @@ doxygen-clean:
 	rm -fr $(BUILD)/doc/doxygen
 	rm -f $(BUILD)/doc/doxygen-stamp
 
-$(BUILD)/doc/Doxyfile: Doxyfile.in
-	(cd $(BUILD) && ./config.status doc/Doxyfile)
-
 $(BUILD)/doc/doxygen-stamp: $(DOXYGEN_SOURCES) $(BUILD)/doc/Doxyfile
 	rm -fr $(BUILD)/doc/doxygen
 	mkdir $(BUILD)/doc/doxygen  # some versions seem to not create this directory #628799
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 6fb883f72..305b20085 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-11-20 17:58+0100\n"
+"POT-Creation-Date: 2012-04-16 15:53+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"
@@ -491,7 +491,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:210
+#: apt.ent:211
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of "
@@ -510,6 +510,102 @@ msgid ""
 "\">\n"
 msgstr ""
 
+#. type: Plain text
+#: apt.ent:214
+msgid ""
+"<!-- TRANSLATOR: used as in -o=config_string "
+"e.g. -o=Debug::pkgProblemResolver=1 --> <!ENTITY synopsis-config-string "
+"\"config_string\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:217
+msgid ""
+"<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+"synopsis-config-file \"config_file\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:220
+msgid ""
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release "
+"e.g. -t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"\"target_release\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:223
+msgid ""
+"<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+"synopsis-architecture \"architecture\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:226
+msgid ""
+"<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+"--> <!ENTITY synopsis-pkg \"pkg\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:229
+msgid ""
+"<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> "
+"<!ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:232
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+"pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:235
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+"awesome --> <!ENTITY synopsis-regex \"regex\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:238
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
+"-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:241
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory "
+"e.g. apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+"\"temporary_directory\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:244
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+"synopsis-filename \"filename\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:250
+msgid ""
+"<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive "
+"packages path override pathprefix --> <!ENTITY synopsis-path \"path\"> "
+"<!ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section "
+"\"section\"> <!ENTITY synopsis-override \"override\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:253
+msgid ""
+"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+msgstr ""
+
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:16
@@ -538,40 +634,13 @@ msgstr ""
 msgid "query the APT cache"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cache.8.xml:39
-msgid ""
-"<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
-"<arg>search <arg "
-"choice=\"plain\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>depends <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>pkgnames <arg "
-"choice=\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty "
-"<arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>xvcg <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>policy <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> "
-"</group>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121 apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 sources.list.5.xml:36
+#: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38 apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38 apt-key.8.xml:30 apt-mark.8.xml:38 apt-secure.8.xml:43 apt-sortpkgs.1.xml:38 apt.conf.5.xml:42 apt_preferences.5.xml:36 sources.list.5.xml:36
 msgid "Description"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:65
+#: apt-cache.8.xml:39
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -580,19 +649,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:70 apt-get.8.xml:127
+#: apt-cache.8.xml:44 apt-get.8.xml:44
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:74
+#: apt-cache.8.xml:48
 msgid "gencaches"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:75
+#: apt-cache.8.xml:49
 msgid ""
 "<literal>gencaches</literal> performs the same operation as <command>apt-get "
 "check</command>. It builds the source and package caches from the sources in "
@@ -600,12 +669,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:81
+#: apt-cache.8.xml:55
 msgid "showpkg <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:82
+#: apt-cache.8.xml:56
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -619,7 +688,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:94
+#: apt-cache.8.xml:68
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -635,7 +704,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:106
+#: apt-cache.8.xml:80
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -647,26 +716,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:89
 msgid "stats"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:89
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:118
+#: apt-cache.8.xml:92
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:122
+#: apt-cache.8.xml:96
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -675,7 +744,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:128
+#: apt-cache.8.xml:102
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -686,7 +755,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:136
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -695,7 +764,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:142
+#: apt-cache.8.xml:116
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -705,7 +774,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:149
+#: apt-cache.8.xml:123
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -715,7 +784,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:130
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache; this value is therefore at least equal to the number of "
@@ -725,19 +794,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:163
+#: apt-cache.8.xml:137
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:170
+#: apt-cache.8.xml:144
 msgid "showsrc <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -745,48 +814,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:176 apt-config.8.xml:87
+#: apt-cache.8.xml:150 apt-config.8.xml:75
 msgid "dump"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:151
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the "
 "cache. It is primarily for debugging."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:181
+#: apt-cache.8.xml:155
 msgid "dumpavail"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:156
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:186
+#: apt-cache.8.xml:160
 msgid "unmet"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:161
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml:165
 msgid "show <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg "
 "--print-avail</command>; it displays the package records for the named "
@@ -794,12 +863,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:171
 msgid "search <replaceable>regex [ regex ... ]</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:172
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see "
@@ -814,43 +883,43 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:211
+#: apt-cache.8.xml:185
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:215
+#: apt-cache.8.xml:189
 msgid "depends <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:216
+#: apt-cache.8.xml:190
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:220
+#: apt-cache.8.xml:194
 msgid "rdepends <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:195
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:225
+#: apt-cache.8.xml:199
 msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml:200
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -860,7 +929,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:205
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -868,12 +937,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:236
+#: apt-cache.8.xml:210
 msgid "dotty <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:237
+#: apt-cache.8.xml:211
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink "
@@ -886,7 +955,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:246
+#: apt-cache.8.xml:220
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -895,17 +964,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:251
+#: apt-cache.8.xml:225
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
+#: apt-cache.8.xml:228
 msgid "xvcg <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:229
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
 "url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG "
@@ -913,12 +982,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:259
+#: apt-cache.8.xml:233
 msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:260
+#: apt-cache.8.xml:234
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -927,12 +996,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:266
+#: apt-cache.8.xml:240
 msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:267
+#: apt-cache.8.xml:241
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -944,22 +1013,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126 apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
+#: apt-cache.8.xml:252 apt-config.8.xml:84 apt-extracttemplates.1.xml:51 apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108 apt-sortpkgs.1.xml:48 apt.conf.5.xml:577 apt.conf.5.xml:599
 msgid "options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:256
 msgid "<option>-p</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:256
 msgid "<option>--pkg-cache</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:283
+#: apt-cache.8.xml:257
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: "
@@ -967,17 +1036,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404 apt-sortpkgs.1.xml:61
+#: apt-cache.8.xml:262 apt-ftparchive.1.xml:551 apt-get.8.xml:321 apt-sortpkgs.1.xml:52
 msgid "<option>-s</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
+#: apt-cache.8.xml:262
 msgid "<option>--src-cache</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:263
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -987,17 +1056,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
+#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311
 msgid "<option>-q</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
+#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311
 msgid "<option>--quiet</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:271
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1006,17 +1075,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:277
 msgid "<option>-i</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:277
 msgid "<option>--important</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:304
+#: apt-cache.8.xml:278
 msgid ""
 "Print only important dependencies; for use with unmet and depends. Causes "
 "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
@@ -1024,47 +1093,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
+#: apt-cache.8.xml:283
 msgid "<option>--no-pre-depends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:284
 msgid "<option>--no-depends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:285
 msgid "<option>--no-recommends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:286
 msgid "<option>--no-suggests</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:287
 msgid "<option>--no-conflicts</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:314
+#: apt-cache.8.xml:288
 msgid "<option>--no-breaks</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315
+#: apt-cache.8.xml:289
 msgid "<option>--no-replaces</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:290
 msgid "<option>--no-enhances</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:291
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -1074,34 +1143,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
+#: apt-cache.8.xml:297 apt-cdrom.8.xml:111 apt-get.8.xml:278
 msgid "<option>-f</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323
+#: apt-cache.8.xml:297
 msgid "<option>--full</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:324
+#: apt-cache.8.xml:298
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 apt-get.8.xml:447
+#: apt-cache.8.xml:302 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563 apt-get.8.xml:369
 msgid "<option>-a</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:302
 msgid "<option>--all-versions</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:303
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If "
@@ -1112,17 +1181,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:311
 msgid "<option>-g</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:311
 msgid "<option>--generate</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:312
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use "
@@ -1131,29 +1200,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:317
 msgid "<option>--names-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343 apt-cdrom.8.xml:142
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:129
 msgid "<option>-n</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:318
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:348
+#: apt-cache.8.xml:322
 msgid "<option>--all-names</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:323
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: "
@@ -1161,12 +1230,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:354
+#: apt-cache.8.xml:328
 msgid "<option>--recurse</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:355
+#: apt-cache.8.xml:329
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1174,12 +1243,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:360
+#: apt-cache.8.xml:334
 msgid "<option>--installed</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:362
+#: apt-cache.8.xml:336
 msgid ""
 "Limit the output of <literal>depends</literal> and "
 "<literal>rdepends</literal> to packages which are currently installed.  "
@@ -1187,37 +1256,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:591 apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89 apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513 apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:596 apt-key.8.xml:175 apt-mark.8.xml:144 apt.conf.5.xml:1110 apt_preferences.5.xml:697
+#: apt-cache.8.xml:346 apt-get.8.xml:518 apt-key.8.xml:167 apt-mark.8.xml:126 apt.conf.5.xml:1110 apt_preferences.5.xml:697
 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:348
 msgid "&file-sourceslist; &file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:606 apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704 sources.list.5.xml:250
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94 apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528 apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185 apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704 sources.list.5.xml:255
 msgid "See Also"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:380
+#: apt-cache.8.xml:354
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:612 apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99 apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534 apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:385
+#: apt-cache.8.xml:359
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1240,18 +1309,8 @@ msgstr ""
 msgid "APT CDROM management utility"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cdrom.8.xml:38
-msgid ""
-"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
-"<arg>add</arg> <arg>ident</arg> </group>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
+#: apt-cdrom.8.xml:38
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -1260,7 +1319,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:45
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
@@ -1268,12 +1327,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:68
+#: apt-cdrom.8.xml:55
 msgid "add"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:69
+#: apt-cdrom.8.xml:56
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@ -1283,7 +1342,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:77
+#: apt-cdrom.8.xml:64
 msgid ""
 "APT uses a CDROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in "
@@ -1291,19 +1350,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:84
+#: apt-cdrom.8.xml:71
 msgid "ident"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:85
+#: apt-cdrom.8.xml:72
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:64
+#: apt-cdrom.8.xml:51
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present.  <placeholder "
@@ -1311,22 +1370,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:161
+#: apt-cdrom.8.xml:81 apt-key.8.xml:153
 msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
+#: apt-cdrom.8.xml:85 apt-ftparchive.1.xml:519 apt-get.8.xml:273
 msgid "<option>-d</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98
+#: apt-cdrom.8.xml:85
 msgid "<option>--cdrom</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:99
+#: apt-cdrom.8.xml:86
 msgid ""
 "Mount point; specify the location to mount the cdrom. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -1334,17 +1393,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
+#: apt-cdrom.8.xml:94
 msgid "<option>-r</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
+#: apt-cdrom.8.xml:94
 msgid "<option>--rename</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:108
+#: apt-cdrom.8.xml:95
 msgid ""
 "Rename a disc; change the label of a disk or override the disks given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -1352,17 +1411,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116 apt-get.8.xml:375
+#: apt-cdrom.8.xml:103 apt-get.8.xml:292
 msgid "<option>-m</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116
+#: apt-cdrom.8.xml:103
 msgid "<option>--no-mount</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:117
+#: apt-cdrom.8.xml:104
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: "
@@ -1370,12 +1429,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:124
+#: apt-cdrom.8.xml:111
 msgid "<option>--fast</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:125
+#: apt-cdrom.8.xml:112
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1384,12 +1443,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:134
+#: apt-cdrom.8.xml:121
 msgid "<option>--thorough</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:135
+#: apt-cdrom.8.xml:122
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1397,22 +1456,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:143 apt-get.8.xml:406
+#: apt-cdrom.8.xml:130 apt-get.8.xml:323
 msgid "<option>--just-print</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:144 apt-get.8.xml:408
+#: apt-cdrom.8.xml:131 apt-get.8.xml:325
 msgid "<option>--recon</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:145 apt-get.8.xml:409
+#: apt-cdrom.8.xml:132 apt-get.8.xml:326
 msgid "<option>--no-act</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:133
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -1420,12 +1479,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:159
+#: apt-cdrom.8.xml:146
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:164
+#: apt-cdrom.8.xml:151
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1449,17 +1508,8 @@ msgstr ""
 msgid "APT Configuration Query program"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-config.8.xml:39
-msgid ""
-"<command>apt-config</command> <arg><option>-hv</option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:51
+#: apt-config.8.xml:39
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -1468,19 +1518,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:56 apt-ftparchive.1.xml:75
+#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:49
 msgid "shell"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:63
+#: apt-config.8.xml:51
 msgid ""
 "shell is used to access the configuration information from a shell "
 "script. It is given pairs of arguments, the first being a shell variable and "
@@ -1490,7 +1540,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:71
+#: apt-config.8.xml:59
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -1499,14 +1549,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:76
+#: apt-config.8.xml:64
 msgid ""
 "This will set the shell environment variable $OPTS to the value of "
 "MyApp::options with a default of <option>-f</option>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:80
+#: apt-config.8.xml:68
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -1514,17 +1564,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:89
+#: apt-config.8.xml:77
 msgid "Just show the contents of the configuration space."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 apt-sortpkgs.1.xml:73
+#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112
+#: apt-config.8.xml:100
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1545,17 +1595,8 @@ msgstr ""
 msgid "Utility to extract DebConf config and templates from Debian packages"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-extracttemplates.1.xml:39
-msgid ""
-"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-"<arg><option>-t=<replaceable>temporary "
-"directory</replaceable></option></arg> <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>file</replaceable></arg>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:39
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -1565,12 +1606,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:52
+#: apt-extracttemplates.1.xml:44
 msgid "package version template-file config-script"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:53
+#: apt-extracttemplates.1.xml:45
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the -t or --tempdir "
@@ -1580,17 +1621,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63 apt-get.8.xml:525
+#: apt-extracttemplates.1.xml:55 apt-get.8.xml:447
 msgid "<option>-t</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63
+#: apt-extracttemplates.1.xml:55
 msgid "<option>--tempdir</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:65
+#: apt-extracttemplates.1.xml:57
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
 "config scripts.  Configuration Item: "
@@ -1598,7 +1639,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:82
+#: apt-extracttemplates.1.xml:74
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -1622,33 +1663,8 @@ msgstr ""
 msgid "Utility to generate index files"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-ftparchive.1.xml:39
-msgid ""
-"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-"<arg><option>--readonly</option></arg> "
-"<arg><option>--contents</option></arg> <arg><option>--arch "
-"<replaceable>architecture</replaceable></option></arg> <arg><option>-o "
-"<replaceable>config</replaceable>=<replaceable>string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>packages<arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>sources<arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>contents <arg "
-"choice=\"plain\"><replaceable>path</replaceable></arg></arg> <arg>release "
-"<arg choice=\"plain\"><replaceable>path</replaceable></arg></arg> "
-"<arg>generate <arg "
-"choice=\"plain\"><replaceable>config-file</replaceable></arg> <arg "
-"choice=\"plain\" "
-"rep=\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean "
-"<arg choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> "
-"</group>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -1657,7 +1673,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:64
+#: apt-ftparchive.1.xml:43
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the "
@@ -1667,7 +1683,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:70
+#: apt-ftparchive.1.xml:49
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -1677,12 +1693,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:79
+#: apt-ftparchive.1.xml:58
 msgid "packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:81
+#: apt-ftparchive.1.xml:60
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -1691,17 +1707,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
+#: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
 msgid "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:89
+#: apt-ftparchive.1.xml:68
 msgid "sources"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:70
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -1710,7 +1726,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:75
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -1718,12 +1734,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:101
+#: apt-ftparchive.1.xml:80
 msgid "contents"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:103
+#: apt-ftparchive.1.xml:82
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it for "
@@ -1734,12 +1750,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:113
+#: apt-ftparchive.1.xml:92
 msgid "release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:115
+#: apt-ftparchive.1.xml:94
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -1755,7 +1771,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:125
+#: apt-ftparchive.1.xml:104
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under "
@@ -1769,12 +1785,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:115
 msgid "generate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:138
+#: apt-ftparchive.1.xml:117
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -1784,24 +1800,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
+#: apt-ftparchive.1.xml:124 apt-get.8.xml:215
 msgid "clean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:126
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:153
+#: apt-ftparchive.1.xml:132
 msgid "The Generate Configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:134
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -1812,17 +1828,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:163
+#: apt-ftparchive.1.xml:142
 msgid "The generate configuration has 4 separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:144
 msgid "Dir Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:146
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -1831,12 +1847,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:151
 msgid "ArchiveDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:153
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -1844,44 +1860,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:179
+#: apt-ftparchive.1.xml:158
 msgid "OverrideDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:160
 msgid "Specifies the location of the override files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:184
+#: apt-ftparchive.1.xml:163
 msgid "CacheDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:165
 msgid "Specifies the location of the cache files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:189
+#: apt-ftparchive.1.xml:168
 msgid "FileListDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:170
 msgid ""
 "Specifies the location of the file list files, if the "
 "<literal>FileList</literal> setting is used below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:176
 msgid "Default Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:199
+#: apt-ftparchive.1.xml:178
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -1889,12 +1905,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
+#: apt-ftparchive.1.xml:182
 msgid "Packages::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:184
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -1903,72 +1919,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:190
 msgid "Packages::Extensions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:213
+#: apt-ftparchive.1.xml:192
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:196
 msgid "Sources::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:219
+#: apt-ftparchive.1.xml:198
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:202
 msgid "Sources::Extensions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:225
+#: apt-ftparchive.1.xml:204
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:208
 msgid "Contents::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:210
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:214
 msgid "Translation::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:237
+#: apt-ftparchive.1.xml:216
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
+#: apt-ftparchive.1.xml:220
 msgid "DeLinkLimit"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:222
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section "
@@ -1976,36 +1992,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248
+#: apt-ftparchive.1.xml:227
 msgid "FileMode"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:229
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
+#: apt-ftparchive.1.xml:234 apt-ftparchive.1.xml:380
 msgid "LongDescription"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+#: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:263
+#: apt-ftparchive.1.xml:242
 msgid "TreeDefault Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml:244
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -2013,12 +2029,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:249
 msgid "MaxContentsChange"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:272
+#: apt-ftparchive.1.xml:251
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each "
 "day. The contents files are round-robined so that over several days they "
@@ -2026,12 +2042,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:256
 msgid "ContentsAge"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:279
+#: apt-ftparchive.1.xml:258
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is "
@@ -2042,60 +2058,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:267
 msgid "Directory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:290
+#: apt-ftparchive.1.xml:269
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to "
 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:273
 msgid "SrcDirectory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:296
+#: apt-ftparchive.1.xml:275
 msgid ""
 "Sets the top of the source package directory tree. Defaults to "
 "<filename>$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:418
 msgid "Packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:281
 msgid ""
 "Sets the output Packages file. Defaults to "
 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:306 apt-ftparchive.1.xml:444
+#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:423
 msgid "Sources"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:287
 msgid ""
 "Sets the output Sources file. Defaults to "
 "<filename>$(DIST)/$(SECTION)/source/Sources</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
+#: apt-ftparchive.1.xml:291
 msgid "Translation"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:293
 msgid ""
 "Set the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to "
@@ -2103,12 +2119,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319
+#: apt-ftparchive.1.xml:298
 msgid "InternalPrefix"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:300
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to "
@@ -2116,12 +2132,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:305 apt-ftparchive.1.xml:429
 msgid "Contents"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:307
 msgid ""
 "Sets the output Contents file. Defaults to "
 "<filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes "
@@ -2131,34 +2147,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:314
 msgid "Contents::Header"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:316
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:340 apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:454
 msgid "BinCacheDB"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:342
+#: apt-ftparchive.1.xml:321
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:325
 msgid "FileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:327
 msgid ""
 "Specifies that instead of walking the directory tree, "
 "<command>apt-ftparchive</command> should read the list of files from the "
@@ -2166,12 +2182,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:353
+#: apt-ftparchive.1.xml:332
 msgid "SourceFileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:355
+#: apt-ftparchive.1.xml:334
 msgid ""
 "Specifies that instead of walking the directory tree, "
 "<command>apt-ftparchive</command> should read the list of files from the "
@@ -2180,12 +2196,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:342
 msgid "Tree Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:365
+#: apt-ftparchive.1.xml:344
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -2195,7 +2211,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:349
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -2204,7 +2220,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:375
+#: apt-ftparchive.1.xml:354
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
@@ -2212,7 +2228,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:381
+#: apt-ftparchive.1.xml:360
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -2222,7 +2238,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:378
+#: apt-ftparchive.1.xml:357
 msgid ""
 "When processing a <literal>Tree</literal> section "
 "<command>apt-ftparchive</command> performs an operation similar to: "
@@ -2230,12 +2246,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
+#: apt-ftparchive.1.xml:366
 msgid "Sections"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389
+#: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib "
@@ -2243,12 +2259,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
+#: apt-ftparchive.1.xml:373 apt.conf.5.xml:157
 msgid "Architectures"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:375
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -2256,56 +2272,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:434
 msgid "BinOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:388
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:439
 msgid "SrcOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:415
+#: apt-ftparchive.1.xml:394
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
+#: apt-ftparchive.1.xml:398 apt-ftparchive.1.xml:444
 msgid "ExtraOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
 msgid "Sets the binary extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:424 apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:403 apt-ftparchive.1.xml:449
 msgid "SrcExtraOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
+#: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
 msgid "Sets the source extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:431
+#: apt-ftparchive.1.xml:410
 msgid "BinDirectory Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:412
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -2315,64 +2331,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:441
+#: apt-ftparchive.1.xml:420
 msgid "Sets the Packages file output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:446
+#: apt-ftparchive.1.xml:425
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml:431
 msgid "Sets the Contents file output. (optional)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:457
+#: apt-ftparchive.1.xml:436
 msgid "Sets the binary override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:441
 msgid "Sets the source override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:477
+#: apt-ftparchive.1.xml:456
 msgid "Sets the cache DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:459
 msgid "PathPrefix"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:461
 msgid "Appends a path to all the output paths."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:464
 msgid "FileList, SourceFileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:466
 msgid "Specifies the file list file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:473
 msgid "The Binary Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:495
+#: apt-ftparchive.1.xml:474
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -2382,19 +2398,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:480
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:482
 #, no-wrap
 msgid "new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:500
+#: apt-ftparchive.1.xml:479
 msgid ""
 "The general form of the maintainer field is: <placeholder "
 "type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
@@ -2405,12 +2421,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:490
 msgid "The Source Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:513
+#: apt-ftparchive.1.xml:492
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -2418,12 +2434,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:497
 msgid "The Extra Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:520
+#: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -2431,12 +2447,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:508
 msgid "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml:510
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -2452,19 +2468,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:540
+#: apt-ftparchive.1.xml:519
 msgid "<option>--db</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:521
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:548
+#: apt-ftparchive.1.xml:527
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2473,12 +2489,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:554
+#: apt-ftparchive.1.xml:533
 msgid "<option>--delink</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:556
+#: apt-ftparchive.1.xml:535
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -2487,12 +2503,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:562
+#: apt-ftparchive.1.xml:541
 msgid "<option>--contents</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:564
+#: apt-ftparchive.1.xml:543
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -2502,12 +2518,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:572
+#: apt-ftparchive.1.xml:551
 msgid "<option>--source-override</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:553
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: "
@@ -2515,24 +2531,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:578
+#: apt-ftparchive.1.xml:557
 msgid "<option>--readonly</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:559
 msgid ""
 "Make the caching databases read only.  Configuration Item: "
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:584
+#: apt-ftparchive.1.xml:563
 msgid "<option>--arch</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:585
+#: apt-ftparchive.1.xml:564
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -2541,12 +2557,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:591
+#: apt-ftparchive.1.xml:570
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:593
+#: apt-ftparchive.1.xml:572
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -2560,12 +2576,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:603
+#: apt-ftparchive.1.xml:582
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:605
+#: apt-ftparchive.1.xml:584
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2575,12 +2591,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544 sources.list.5.xml:209
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1104 apt_preferences.5.xml:544 sources.list.5.xml:214
 msgid "Examples"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:623
+#: apt-ftparchive.1.xml:602
 #, no-wrap
 msgid ""
 "<command>apt-ftparchive</command> packages "
@@ -2589,14 +2605,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:619
+#: apt-ftparchive.1.xml:598
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:633
+#: apt-ftparchive.1.xml:612
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -2620,43 +2636,8 @@ msgstr ""
 msgid "APT package handling utility -- command-line interface"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-get.8.xml:39
-msgid ""
-"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
-"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
-"<option>-t=</option> <arg choice='plain'> "
-"<replaceable>target_release</replaceable> </arg> </arg> <arg> "
-"<option>-a=</option> <arg choice='plain'> "
-"<replaceable>default_architecture</replaceable> </arg> </arg> <group "
-"choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
-"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group "
-"choice='req'> <arg choice='plain'> "
-"=<replaceable>pkg_version_number</replaceable> </arg> <arg choice='plain'> "
-"/<replaceable>target_release</replaceable> </arg> </group> </arg> </arg> "
-"</arg> <arg choice='plain'>remove <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>purge <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>source <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
-"<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-"<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> "
-"</group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
-"</group> </arg> </group>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:122
+#: apt-get.8.xml:39
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
@@ -2665,12 +2646,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:131 apt-key.8.xml:127
+#: apt-get.8.xml:48 apt-key.8.xml:119
 msgid "update"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:132
+#: apt-get.8.xml:49
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -2685,12 +2666,12 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:143 guide.sgml:121
+#: apt-get.8.xml:60 guide.sgml:121
 msgid "upgrade"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:144
+#: apt-get.8.xml:61
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -2706,12 +2687,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:156
+#: apt-get.8.xml:73
 msgid "dselect-upgrade"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:157
+#: apt-get.8.xml:74
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, "
@@ -2722,12 +2703,12 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:166 guide.sgml:140
+#: apt-get.8.xml:83 guide.sgml:140
 msgid "dist-upgrade"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:167
+#: apt-get.8.xml:84
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -2741,12 +2722,12 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:179 guide.sgml:131
+#: apt-get.8.xml:96 guide.sgml:131
 msgid "install"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:181
+#: apt-get.8.xml:98
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -2762,7 +2743,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:116
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -2773,14 +2754,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:123
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:209
+#: apt-get.8.xml:126
 msgid ""
 "This is also the target to use if you want to upgrade one or more "
 "already-installed packages without upgrading every package you have on your "
@@ -2792,14 +2773,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:220
+#: apt-get.8.xml:137
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:141
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -2811,12 +2792,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:233
+#: apt-get.8.xml:150
 msgid "remove"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:151
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -2826,12 +2807,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:241
+#: apt-get.8.xml:158
 msgid "purge"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:242
+#: apt-get.8.xml:159
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -2839,12 +2820,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:163
 msgid "source"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:247
+#: apt-get.8.xml:164
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -2856,7 +2837,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:255
+#: apt-get.8.xml:172
 msgid ""
 "Source packages are tracked separately from binary packages via "
 "<literal>deb-src</literal> type lines in the &sources-list; file. This means "
@@ -2867,7 +2848,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:179
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -2877,7 +2858,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:186
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -2887,7 +2868,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:275
+#: apt-get.8.xml:192
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -2895,12 +2876,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:280
+#: apt-get.8.xml:197
 msgid "build-dep"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:281
+#: apt-get.8.xml:198
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -2910,31 +2891,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
+#: apt-get.8.xml:204
 msgid "check"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:205
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:209
 msgid "download"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:210
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:299
+#: apt-get.8.xml:216
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -2946,12 +2927,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:225
 msgid "autoclean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:309
+#: apt-get.8.xml:226
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -2963,12 +2944,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:318
+#: apt-get.8.xml:235
 msgid "autoremove"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
+#: apt-get.8.xml:236
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -2976,12 +2957,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323
+#: apt-get.8.xml:240
 msgid "changelog"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:241
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -2994,48 +2975,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:346
+#: apt-get.8.xml:263
 msgid "<option>--no-install-recommends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:264
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:351
+#: apt-get.8.xml:268
 msgid "<option>--install-suggests</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml:269
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:356
+#: apt-get.8.xml:273
 msgid "<option>--download-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:357
+#: apt-get.8.xml:274
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:361
+#: apt-get.8.xml:278
 msgid "<option>--fix-broken</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:362
+#: apt-get.8.xml:279
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
@@ -3051,17 +3032,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:375
+#: apt-get.8.xml:292
 msgid "<option>--ignore-missing</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:376
+#: apt-get.8.xml:293
 msgid "<option>--fix-missing</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:294
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -3073,12 +3054,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:387
+#: apt-get.8.xml:304
 msgid "<option>--no-download</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:388
+#: apt-get.8.xml:305
 msgid ""
 "Disables downloading of packages. This is best used with "
 "<option>--ignore-missing</option> to force APT to use only the .debs it has "
@@ -3087,7 +3068,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:395
+#: apt-get.8.xml:312
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3099,17 +3080,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:405
+#: apt-get.8.xml:322
 msgid "<option>--simulate</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:407
+#: apt-get.8.xml:324
 msgid "<option>--dry-run</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:410
+#: apt-get.8.xml:327
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: "
@@ -3117,7 +3098,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:331
 msgid ""
 "Simulation run as user will deactivate locking "
 "(<literal>Debug::NoLocking</literal>)  automatic. Also a notice will be "
@@ -3129,7 +3110,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:337
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -3138,22 +3119,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:344
 msgid "<option>-y</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:344
 msgid "<option>--yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:428
+#: apt-get.8.xml:345
 msgid "<option>--assume-yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:429
+#: apt-get.8.xml:346
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -3163,46 +3144,58 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:353
+msgid "<option>--assume-no</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:354
+msgid ""
+"Automatic \"no\" to all prompts.  Configuration Item: "
+"<literal>APT::Get::Assume-No</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:358
 msgid "<option>-u</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:358
 msgid "<option>--show-upgraded</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:437
+#: apt-get.8.xml:359
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:364
 msgid "<option>-V</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:364
 msgid "<option>--verbose-versions</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:365
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:370
 msgid "<option>--host-architecture</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:371
 msgid ""
 "This option controls the architecture packages are built for by "
 "<command>apt-get source --compile</command> and how cross-builddependencies "
@@ -3213,34 +3206,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:379
 msgid "<option>-b</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:379
 msgid "<option>--compile</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:458
+#: apt-get.8.xml:380
 msgid "<option>--build</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:459
+#: apt-get.8.xml:381
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:385
 msgid "<option>--ignore-hold</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:464
+#: apt-get.8.xml:386
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -3249,12 +3242,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:470
+#: apt-get.8.xml:392
 msgid "<option>--no-upgrade</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:393
 msgid ""
 "Do not upgrade packages; When used in conjunction with "
 "<literal>install</literal>, <literal>no-upgrade</literal> will prevent "
@@ -3263,12 +3256,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:477
+#: apt-get.8.xml:399
 msgid "<option>--only-upgrade</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:478
+#: apt-get.8.xml:400
 msgid ""
 "Do not install new packages; When used in conjunction with "
 "<literal>install</literal>, <literal>only-upgrade</literal> will prevent "
@@ -3277,12 +3270,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:484
+#: apt-get.8.xml:406
 msgid "<option>--force-yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:485
+#: apt-get.8.xml:407
 msgid ""
 "Force yes; This is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -3292,12 +3285,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:492
+#: apt-get.8.xml:414
 msgid "<option>--print-uris</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:493
+#: apt-get.8.xml:415
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected md5 "
@@ -3310,12 +3303,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:503
+#: apt-get.8.xml:425
 msgid "<option>--purge</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:504
+#: apt-get.8.xml:426
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be "
@@ -3325,24 +3318,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
+#: apt-get.8.xml:433
 msgid "<option>--reinstall</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:434
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:516
+#: apt-get.8.xml:438
 msgid "<option>--list-cleanup</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:517
+#: apt-get.8.xml:439
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -3353,17 +3346,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:448
 msgid "<option>--target-release</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:527
+#: apt-get.8.xml:449
 msgid "<option>--default-release</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:450
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -3378,12 +3371,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:541
+#: apt-get.8.xml:463
 msgid "<option>--trivial-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:465
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where "
@@ -3393,24 +3386,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
+#: apt-get.8.xml:471
 msgid "<option>--no-remove</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:550
+#: apt-get.8.xml:472
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:477
 msgid "<option>--auto-remove</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:556
+#: apt-get.8.xml:478
 msgid ""
 "If the command is either <literal>install</literal> or "
 "<literal>remove</literal>, then this option acts like running "
@@ -3419,12 +3412,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:562
+#: apt-get.8.xml:484
 msgid "<option>--only-source</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:563
+#: apt-get.8.xml:485
 msgid ""
 "Only has meaning for the <literal>source</literal> and "
 "<literal>build-dep</literal> commands.  Indicates that the given source "
@@ -3436,22 +3429,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--diff-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--dsc-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--tar-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:574
+#: apt-get.8.xml:496
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, "
@@ -3460,24 +3453,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:579
+#: apt-get.8.xml:501
 msgid "<option>--arch-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:580
+#: apt-get.8.xml:502
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:584
+#: apt-get.8.xml:506
 msgid "<option>--allow-unauthenticated</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:585
+#: apt-get.8.xml:507
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: "
@@ -3485,14 +3478,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:598
+#: apt-get.8.xml:520
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:607
+#: apt-get.8.xml:529
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, "
@@ -3500,29 +3493,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:613
+#: apt-get.8.xml:535
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:616
+#: apt-get.8.xml:538
 msgid "ORIGINAL AUTHORS"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:617
+#: apt-get.8.xml:539
 msgid "&apt-author.jgunthorpe;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:620
+#: apt-get.8.xml:542
 msgid "CURRENT AUTHORS"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:622
+#: apt-get.8.xml:544
 msgid "&apt-author.team;"
 msgstr ""
 
@@ -3536,17 +3529,8 @@ msgstr ""
 msgid "APT key management utility"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-key.8.xml:31
-msgid ""
-"<command>apt-key</command> <arg><option>--keyring "
-"<replaceable>filename</replaceable></option></arg> "
-"<arg><replaceable>command</replaceable></arg> <arg "
-"rep=\"repeat\"><option><replaceable>arguments</replaceable></option></arg>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:40
+#: apt-key.8.xml:32
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -3554,87 +3538,87 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:46
+#: apt-key.8.xml:38
 msgid "Commands"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:48
-msgid "add <replaceable>filename</replaceable>"
+#: apt-key.8.xml:40
+msgid "add &synopsis-param-filename;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:44
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from "
-"<replaceable>filename</replaceable>, or standard input if "
-"<replaceable>filename</replaceable> is <literal>-</literal>."
+"&synopsis-param-filename;, or standard input if &synopsis-param-filename; is "
+"<literal>-</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:60
-msgid "del <replaceable>keyid</replaceable>"
+#: apt-key.8.xml:52
+msgid "del &synopsis-param-keyid;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:64
+#: apt-key.8.xml:56
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:71
-msgid "export <replaceable>keyid</replaceable>"
+#: apt-key.8.xml:63
+msgid "export &synopsis-param-keyid;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:75
-msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+#: apt-key.8.xml:67
+msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:74
 msgid "exportall"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:86
+#: apt-key.8.xml:78
 msgid "Output all trusted keys to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:85
 msgid "list"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:97
+#: apt-key.8.xml:89
 msgid "List trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:96
 msgid "finger"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:108
+#: apt-key.8.xml:100
 msgid "List fingerprints of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:107
 msgid "adv"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:119
+#: apt-key.8.xml:111
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:131
+#: apt-key.8.xml:123
 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 "
@@ -3644,12 +3628,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:141
+#: apt-key.8.xml:133
 msgid "net-update"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:137
 msgid ""
 "Work similar to the <command>update</command> command above, but get the "
 "archive keyring from an URI instead and validate it against a master key.  "
@@ -3660,19 +3644,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:154
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:164
-msgid "--keyring <replaceable>filename</replaceable>"
+#: apt-key.8.xml:156
+msgid "--keyring &synopsis-param-filename;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:165
+#: apt-key.8.xml:157
 msgid ""
 "With this option it is possible to specify a specific keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -3683,42 +3667,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:178
+#: apt-key.8.xml:170
 msgid "&file-trustedgpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:180
+#: apt-key.8.xml:172
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:173
 msgid "Local trust database of archive keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:184
+#: apt-key.8.xml:176
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:177
 msgid "Keyring of Debian archive trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:188
+#: apt-key.8.xml:180
 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:189
+#: apt-key.8.xml:181
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:198
+#: apt-key.8.xml:190
 msgid "&apt-get;, &apt-secure;"
 msgstr ""
 
@@ -3740,27 +3724,15 @@ msgstr ""
 msgid "mark/unmark a package as being automatically-installed"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-mark.8.xml:39
-msgid ""
-"  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-"<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
-"choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-"choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
-"choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> "
-"</group> <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>package</replaceable></arg> </arg> </group>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:39
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:61
+#: apt-mark.8.xml:43
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -3770,12 +3742,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:51
 msgid "auto"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:52
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -3783,12 +3755,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:59
 msgid "manual"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:78
+#: apt-mark.8.xml:60
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -3796,12 +3768,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:67
 msgid "hold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:68
 msgid ""
 "<literal>hold</literal> is used to mark a package as hold back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -3811,24 +3783,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:95
+#: apt-mark.8.xml:77
 msgid "unhold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:78
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:83
 msgid "showauto"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:102
+#: apt-mark.8.xml:84
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -3837,12 +3809,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:109
+#: apt-mark.8.xml:91
 msgid "showmanual"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:110
+#: apt-mark.8.xml:92
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -3850,29 +3822,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:116
+#: apt-mark.8.xml:98
 msgid "showhold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:99
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:130
+#: apt-mark.8.xml:112
 msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:131
+#: apt-mark.8.xml:113
 msgid "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:116
 msgid ""
 "Read/Write package stats from "
 "<filename><replaceable>FILENAME</replaceable></filename> instead of the "
@@ -3881,17 +3853,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:146
+#: apt-mark.8.xml:128
 msgid "  &file-extended_states;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:151
+#: apt-mark.8.xml:133
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:155
+#: apt-mark.8.xml:137
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -4134,17 +4106,8 @@ msgstr ""
 msgid "Utility to sort package index files"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-sortpkgs.1.xml:39
-msgid ""
-"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:48
+#: apt-sortpkgs.1.xml:39
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (Source index or "
 "Package index) and sort the records so that they are ordered by the package "
@@ -4153,24 +4116,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:54
+#: apt-sortpkgs.1.xml:45
 msgid "All output is sent to stdout, the input must be a seekable file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:61
+#: apt-sortpkgs.1.xml:52
 msgid "<option>--source</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:63
+#: apt-sortpkgs.1.xml:54
 msgid ""
 "Use Source index field ordering.  Configuration Item: "
 "<literal>APT::SortPkgs::Source</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:77
+#: apt-sortpkgs.1.xml:68
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -4701,7 +4664,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:321 sources.list.5.xml:155
+#: apt.conf.5.xml:321 sources.list.5.xml:160
 msgid "http"
 msgstr ""
 
@@ -4807,7 +4770,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:387 sources.list.5.xml:166
+#: apt.conf.5.xml:387 sources.list.5.xml:171
 msgid "ftp"
 msgstr ""
 
@@ -4862,7 +4825,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426 sources.list.5.xml:148
+#: apt.conf.5.xml:426 sources.list.5.xml:153
 msgid "cdrom"
 msgstr ""
 
@@ -7000,8 +6963,20 @@ msgid ""
 "<literal>APT::Architectures</literal> option will be downloaded."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:121
+msgid ""
+"<literal>trusted=yes</literal> can be set to indicate that packages from "
+"this source are always authenificated even if the "
+"<filename>Release</filename> file is not signed or the signature can't be "
+"checked. This disables parts of &apt-secure; and should therefore only be "
+"used in a local and trusted context. <literal>trusted=no</literal> is the "
+"opposite which handles even correctly authenificated sources as not "
+"authenificated."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:123
+#: sources.list.5.xml:128
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -7010,12 +6985,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:128
+#: sources.list.5.xml:133
 msgid "Some examples:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:135
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -7025,17 +7000,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:141
 msgid "URI specification"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:146
 msgid "file"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:143
+#: sources.list.5.xml:148
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -7043,7 +7018,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:150
+#: sources.list.5.xml:155
 msgid ""
 "The cdrom scheme allows APT to use a local CDROM drive with media "
 "swapping. Use the &apt-cdrom; program to create cdrom entries in the source "
@@ -7051,7 +7026,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:157
+#: sources.list.5.xml:162
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format "
@@ -7062,7 +7037,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:173
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual "
@@ -7074,12 +7049,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:177
+#: sources.list.5.xml:182
 msgid "copy"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:179
+#: sources.list.5.xml:184
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -7087,17 +7062,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
 msgid "rsh"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
 msgid "ssh"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:186
+#: sources.list.5.xml:191
 msgid ""
 "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
 "user and access the files. It is a good idea to do prior arrangements with "
@@ -7107,12 +7082,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:199
 msgid "more recognizable URI types"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:196
+#: sources.list.5.xml:201
 msgid ""
 "APT can be extended with more methods shipped in other optional packages "
 "which should follow the nameing scheme "
@@ -7126,49 +7101,49 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:138
+#: sources.list.5.xml:143
 msgid ""
 "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
 "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:215
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:217
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:214
+#: sources.list.5.xml:219
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:220
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:222
 msgid "Source line for the above"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:223
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:225
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7176,7 +7151,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:227
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7184,33 +7159,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:230
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
+#: sources.list.5.xml:232
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:229
+#: sources.list.5.xml:234
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:231
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:238
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7219,19 +7194,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:246
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:244
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under "
@@ -7243,7 +7218,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:256
 msgid "&apt-cache; &apt-conf;"
 msgstr ""
 
diff --git a/doc/po/de.po b/doc/po/de.po
index ad4f756f3..3278a1f56 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 0.8.15-9\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2011-10-05 23:06+0300\n"
+"POT-Creation-Date: 2012-04-11 17:54+0300\n"
 "PO-Revision-Date: 2011-11-13 11:21+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -633,7 +633,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:210
+#: apt.ent:211
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -653,6 +653,101 @@ msgstr ""
 "     die Übersetzung hinter dem Originalinhalt hinterherhängt.\n"
 "\">\n"
 
+#. type: Plain text
+#: apt.ent:214
+msgid ""
+"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
+"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:217
+msgid ""
+"<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+"synopsis-config-file \"config_file\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:220
+msgid ""
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
+"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"\"target_release\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:223
+msgid ""
+"<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+"synopsis-architecture \"architecture\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:226
+msgid ""
+"<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+"--> <!ENTITY synopsis-pkg \"pkg\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:229
+msgid ""
+"<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
+"ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:232
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+"pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:235
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+"awesome --> <!ENTITY synopsis-regex \"regex\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:238
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
+"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:241
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
+"apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+"\"temporary_directory\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:244
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+"synopsis-filename \"filename\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:250
+msgid ""
+"<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive "
+"packages path override pathprefix --> <!ENTITY synopsis-path \"path\"> <!"
+"ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section "
+"\"section\"> <!ENTITY synopsis-override \"override\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:253
+msgid ""
+"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+msgstr ""
+
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:16
@@ -688,61 +783,17 @@ msgstr "APT"
 msgid "query the APT cache"
 msgstr "den APT-Zwischenspeicher abfragen"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cache.8.xml:39
-msgid ""
-"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
-"<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
-"arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></arg></"
-"arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>policy <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></"
-"arg> </group>"
-msgstr ""
-"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
-"o=<replaceable>Konfigurationszeichenkette</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>Datei</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>Paket</replaceable></arg></arg> <arg>showsrc <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
-"<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
-"<arg>search <arg choice=\"plain\"><replaceable>regulärer_Ausdruck</"
-"replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>Paket</replaceable></arg></arg> <arg>depends <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
-"<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</"
-"replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
-"\"><replaceable>Präfix</replaceable></arg></arg> <arg>dotty <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
-"<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</"
-"replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>Pakete</replaceable></arg></arg> <arg>madison <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>Pakete</replaceable></arg></arg> </"
-"group>"
-
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
-#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121
-#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
-#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
+#: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38
+#: apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38
+#: apt-key.8.xml:30 apt-mark.8.xml:38 apt-secure.8.xml:43
+#: apt-sortpkgs.1.xml:38 apt.conf.5.xml:42 apt_preferences.5.xml:36
 #: sources.list.5.xml:36
 msgid "Description"
 msgstr "Beschreibung"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:65
+#: apt-cache.8.xml:39
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -755,7 +806,7 @@ msgstr ""
 "und Generieren von interessanten Ausgaben der Paket-Metadaten bereit."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:70 apt-get.8.xml:127
+#: apt-cache.8.xml:44 apt-get.8.xml:44
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -764,12 +815,12 @@ msgstr ""
 "angegeben ist, muss einer der unten aufgeführten Befehle vorkommen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:74
+#: apt-cache.8.xml:48
 msgid "gencaches"
 msgstr "gencaches"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:75
+#: apt-cache.8.xml:49
 msgid ""
 "<literal>gencaches</literal> performs the same operation as <command>apt-get "
 "check</command>. It builds the source and package caches from the sources in "
@@ -781,12 +832,12 @@ msgstr ""
 "filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:81
+#: apt-cache.8.xml:55
 msgid "showpkg <replaceable>pkg(s)</replaceable>"
 msgstr "showpkg <replaceable>Paket(e)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:82
+#: apt-cache.8.xml:56
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -810,7 +861,7 @@ msgstr ""
 "Ausgabe ähnlich der folgenden erzeugen:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:94
+#: apt-cache.8.xml:68
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -836,7 +887,7 @@ msgstr ""
 "Reverse Provides: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:106
+#: apt-cache.8.xml:80
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -854,12 +905,12 @@ msgstr ""
 "restlichen Ausgabe ist es am besten, den apt-Quelltext zu konsultieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:89
 msgid "stats"
 msgstr "stats"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:89
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -868,7 +919,7 @@ msgstr ""
 "Es werden keine weiteren Argumente erwartet. Berichtete Statistiken sind:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:118
+#: apt-cache.8.xml:92
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -877,7 +928,7 @@ msgstr ""
 "Zwischenspeicher gefundenen Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:122
+#: apt-cache.8.xml:96
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -891,7 +942,7 @@ msgstr ""
 "Kategorie."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:128
+#: apt-cache.8.xml:102
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -908,7 +959,7 @@ msgstr ""
 "bereit, aber es gibt kein Paket mit dem Namen »mail-transport-agent«."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:136
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -921,7 +972,7 @@ msgstr ""
 "aber nur ein Paket, xless, stellt »X11-text-viewer« bereit."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:142
+#: apt-cache.8.xml:116
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -934,7 +985,7 @@ msgstr ""
 "tatsächliches Paket, wird aber auch vom Paket debconf-tiny bereitgestellt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:149
+#: apt-cache.8.xml:123
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -950,7 +1001,7 @@ msgstr ""
 "Breaks-Angaben Bezug genommen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:130
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache; this value is therefore at least equal to the number of "
@@ -966,7 +1017,7 @@ msgstr ""
 "sein."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:163
+#: apt-cache.8.xml:137
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -975,12 +1026,12 @@ msgstr ""
 "Abhängigkeitsbeziehungen, den alle Pakete im Zwischenspeicher beanspruchen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:170
+#: apt-cache.8.xml:144
 msgid "showsrc <replaceable>pkg(s)</replaceable>"
 msgstr "showsrc <replaceable>Paket(e)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -991,12 +1042,12 @@ msgstr ""
 "wie alle Datensätze, die den Namen für ein Programm deklarieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:176 apt-config.8.xml:87
+#: apt-cache.8.xml:150 apt-config.8.xml:75
 msgid "dump"
 msgstr "dump"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:151
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -1005,12 +1056,12 @@ msgstr ""
 "im Zwischenspeicher. Es dient in erster Linie der Fehlersuche."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:181
+#: apt-cache.8.xml:155
 msgid "dumpavail"
 msgstr "dumpavail"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:156
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
@@ -1020,12 +1071,12 @@ msgstr ""
 "benutzt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:186
+#: apt-cache.8.xml:160
 msgid "unmet"
 msgstr "unmet"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:161
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -1034,12 +1085,12 @@ msgstr ""
 "Abhängigkeiten im Paketzwischenspeicher."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml:165
 msgid "show <replaceable>pkg(s)</replaceable>"
 msgstr "show <replaceable>Paket(e)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -1049,12 +1100,12 @@ msgstr ""
 "Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:171
 msgid "search <replaceable>regex [ regex ... ]</replaceable>"
 msgstr "search <replaceable>regex [ regex … ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:172
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see "
@@ -1079,7 +1130,7 @@ msgstr ""
 "Beschreibung nicht durchsucht, sondern nur der Paketname."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:211
+#: apt-cache.8.xml:185
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -1088,12 +1139,12 @@ msgstr ""
 "die »und«-verknüpft werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:215
+#: apt-cache.8.xml:189
 msgid "depends <replaceable>pkg(s)</replaceable>"
 msgstr "depends <replaceable>Paket(e)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:216
+#: apt-cache.8.xml:190
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -1103,12 +1154,12 @@ msgstr ""
 "können."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:220
+#: apt-cache.8.xml:194
 msgid "rdepends <replaceable>pkg(s)</replaceable>"
 msgstr "rdepends <replaceable>Paket(e)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:195
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -1117,12 +1168,12 @@ msgstr ""
 "Rückwärtsabhängigkeit, die ein Paket hat."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:225
+#: apt-cache.8.xml:199
 msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
 msgstr "pkgnames <replaceable>[ Präfix ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml:200
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -1137,7 +1188,7 @@ msgstr ""
 "besten mit der <option>--generate</option>-Option benutzt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:205
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -1148,12 +1199,12 @@ msgstr ""
 "Pakete sind z.B. auch in der generierten Liste aufgeführt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:236
+#: apt-cache.8.xml:210
 msgid "dotty <replaceable>pkg(s)</replaceable>"
 msgstr "dotty <replaceable>Paket(e)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:237
+#: apt-cache.8.xml:211
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1175,7 +1226,7 @@ msgstr ""
 "GivenOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:246
+#: apt-cache.8.xml:220
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -1189,19 +1240,19 @@ msgstr ""
 "depends, grüne Linien sind Konflikte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:251
+#: apt-cache.8.xml:225
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 "Vorsicht, dotty kann keine größeren Zusammenstellungen von Paketen grafisch "
 "darstellen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
+#: apt-cache.8.xml:228
 msgid "xvcg <replaceable>pkg(s)</replaceable>"
 msgstr "xvcg <replaceable>Paket(e)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:229
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -1211,12 +1262,12 @@ msgstr ""
 "ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:259
+#: apt-cache.8.xml:233
 msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
 msgstr "policy <replaceable>[ Paket(e) ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:260
+#: apt-cache.8.xml:234
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -1229,12 +1280,12 @@ msgstr ""
 "Informationen über die Prioritätenauswahl der genannten Pakete aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:266
+#: apt-cache.8.xml:240
 msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
 msgstr "madison <replaceable>[ Paket(e) ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:267
+#: apt-cache.8.xml:241
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -1253,24 +1304,24 @@ msgstr ""
 "(<literal>APT::Architecture</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126
-#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
+#: apt-cache.8.xml:252 apt-config.8.xml:84 apt-extracttemplates.1.xml:51
+#: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
+#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:577 apt.conf.5.xml:599
 msgid "options"
 msgstr "Optionen"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:256
 msgid "<option>-p</option>"
 msgstr "<option>-p</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:256
 msgid "<option>--pkg-cache</option>"
 msgstr "<option>--pkg-cache</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:283
+#: apt-cache.8.xml:257
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -1282,18 +1333,18 @@ msgstr ""
 "pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404
-#: apt-sortpkgs.1.xml:61
+#: apt-cache.8.xml:262 apt-ftparchive.1.xml:551 apt-get.8.xml:321
+#: apt-sortpkgs.1.xml:52
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
+#: apt-cache.8.xml:262
 msgid "<option>--src-cache</option>"
 msgstr "<option>--src-cache</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:263
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1310,17 +1361,17 @@ msgstr ""
 "srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
+#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
+#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:271
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1334,17 +1385,17 @@ msgstr ""
 "Konfigurationselement: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:277
 msgid "<option>-i</option>"
 msgstr "<option>-i</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:277
 msgid "<option>--important</option>"
 msgstr "<option>--important</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:304
+#: apt-cache.8.xml:278
 msgid ""
 "Print only important dependencies; for use with unmet and depends. Causes "
 "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
@@ -1355,47 +1406,54 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
+#: apt-cache.8.xml:283
 msgid "<option>--no-pre-depends</option>"
 msgstr "<option>--no-pre-depends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:284
 msgid "<option>--no-depends</option>"
 msgstr "<option>--no-depends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:285
 msgid "<option>--no-recommends</option>"
 msgstr "<option>--no-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:286
 msgid "<option>--no-suggests</option>"
 msgstr "<option>--no-suggests</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:287
 msgid "<option>--no-conflicts</option>"
 msgstr "<option>--no-conflicts</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:314
+#: apt-cache.8.xml:288
 msgid "<option>--no-breaks</option>"
 msgstr "<option>--no-breaks</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315
+#: apt-cache.8.xml:289
 msgid "<option>--no-replaces</option>"
 msgstr "<option>--no-replaces</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:290
 msgid "<option>--no-enhances</option>"
 msgstr "<option>--no-enhances</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:291
+#, fuzzy
+#| msgid ""
+#| "Per default the <literal>depends</literal> and <literal>rdepends</"
+#| "literal> print all dependencies. This can be tweaked with these flags "
+#| "which will omit the specified dependency type.  Configuration Item: "
+#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
+#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -1406,21 +1464,22 @@ msgstr ""
 "Standardmäßig geben <literal>depends</literal> und <literal>rdepends</"
 "literal> alle Abhängigkeiten aus. Dies kann mit diesen Schaltern optimiert "
 "werden, die den angegebenen Abhängigkeitstyp weglassen. "
-"Konfigurationselement: <literal>APT::Cache::Show<replaceable>Abhängigkeitstyp"
-"</replaceable></literal> z.B. <literal>APT::Cache::ShowRecommends</literal>."
+"Konfigurationselement: <literal>APT::Cache::"
+"Show<replaceable>Abhängigkeitstyp</replaceable></literal> z.B. <literal>APT::"
+"Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
+#: apt-cache.8.xml:297 apt-cdrom.8.xml:111 apt-get.8.xml:278
 msgid "<option>-f</option>"
 msgstr "<option>-f</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323
+#: apt-cache.8.xml:297
 msgid "<option>--full</option>"
 msgstr "<option>--full</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:324
+#: apt-cache.8.xml:298
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -1429,18 +1488,18 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
-#: apt-get.8.xml:447
+#: apt-cache.8.xml:302 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563
+#: apt-get.8.xml:369
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:302
 msgid "<option>--all-versions</option>"
 msgstr "<option>--all-versions</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:303
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -1457,17 +1516,17 @@ msgstr ""
 "anwendbar. Konfigurationselement: <literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:311
 msgid "<option>-g</option>"
 msgstr "<option>-g</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:311
 msgid "<option>--generate</option>"
 msgstr "<option>--generate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:312
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1479,17 +1538,17 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:317
 msgid "<option>--names-only</option>"
 msgstr "<option>--names-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343 apt-cdrom.8.xml:142
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:129
 msgid "<option>-n</option>"
 msgstr "<option>-n</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:318
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1498,12 +1557,12 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:348
+#: apt-cache.8.xml:322
 msgid "<option>--all-names</option>"
 msgstr "<option>--all-names</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:323
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -1514,12 +1573,12 @@ msgstr ""
 "<literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:354
+#: apt-cache.8.xml:328
 msgid "<option>--recurse</option>"
 msgstr "<option>--recurse</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:355
+#: apt-cache.8.xml:329
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1530,12 +1589,12 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:360
+#: apt-cache.8.xml:334
 msgid "<option>--installed</option>"
 msgstr "<option>--installed</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:362
+#: apt-cache.8.xml:336
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -1546,46 +1605,46 @@ msgstr ""
 "<literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:591
-#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89
+#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513
+#: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:596 apt-key.8.xml:175 apt-mark.8.xml:144
+#: apt-cache.8.xml:346 apt-get.8.xml:518 apt-key.8.xml:167 apt-mark.8.xml:126
 #: apt.conf.5.xml:1110 apt_preferences.5.xml:697
 msgid "Files"
 msgstr "Dateien"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:348
 msgid "&file-sourceslist; &file-statelists;"
 msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:606
-#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704
-#: sources.list.5.xml:250
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94
+#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528
+#: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704
+#: sources.list.5.xml:255
 msgid "See Also"
 msgstr "Siehe auch"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:380
+#: apt-cache.8.xml:354
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:612
-#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99
+#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534
+#: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr "Diagnose"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:385
+#: apt-cache.8.xml:359
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1612,23 +1671,8 @@ msgstr "apt-cdrom"
 msgid "APT CDROM management utility"
 msgstr "APT-CDROM-Verwaltungswerkzeug"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cdrom.8.xml:38
-msgid ""
-"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
-"<arg>add</arg> <arg>ident</arg> </group>"
-msgstr ""
-"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>CD-ROM-Einhängepunkt</replaceable></option></"
-"arg><arg><option>-o=<replaceable>Konfigurationszeichenkette</replaceable></"
-"option></arg><arg><option>-c=<replaceable>Datei</replaceable></option></"
-"arg><group><arg>hinzufügen</arg><arg>Identifikation</arg></group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
+#: apt-cdrom.8.xml:38
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -1641,7 +1685,7 @@ msgstr ""
 "mehrere mögliche Fehlbrennungen und prüft die Indexdateien."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:45
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
@@ -1653,12 +1697,12 @@ msgstr ""
 "gescannt werden, um auf mögliche Fehlbrennungen zu testen."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:68
+#: apt-cdrom.8.xml:55
 msgid "add"
 msgstr "add"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:69
+#: apt-cdrom.8.xml:56
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@ -1673,7 +1717,7 @@ msgstr ""
 "Verzeichnis hat, werden Sie nach einem aussagekräftigen Titel gefragt."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:77
+#: apt-cdrom.8.xml:64
 msgid ""
 "APT uses a CDROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -1684,12 +1728,12 @@ msgstr ""
 "<filename>&statedir;/cdroms.list</filename>"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:84
+#: apt-cdrom.8.xml:71
 msgid "ident"
 msgstr "ident"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:85
+#: apt-cdrom.8.xml:72
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -1698,7 +1742,7 @@ msgstr ""
 "gespeicherten Dateinamen zu berichten."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:64
+#: apt-cdrom.8.xml:51
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present.  <placeholder type=\"variablelist"
@@ -1709,22 +1753,22 @@ msgstr ""
 "<placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:161
+#: apt-cdrom.8.xml:81 apt-key.8.xml:153
 msgid "Options"
 msgstr "Optionen"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
+#: apt-cdrom.8.xml:85 apt-ftparchive.1.xml:519 apt-get.8.xml:273
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98
+#: apt-cdrom.8.xml:85
 msgid "<option>--cdrom</option>"
 msgstr "<option>--cdrom</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:99
+#: apt-cdrom.8.xml:86
 msgid ""
 "Mount point; specify the location to mount the cdrom. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -1736,17 +1780,17 @@ msgstr ""
 "cdrom::mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
+#: apt-cdrom.8.xml:94
 msgid "<option>-r</option>"
 msgstr "<option>-r</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
+#: apt-cdrom.8.xml:94
 msgid "<option>--rename</option>"
 msgstr "<option>--rename</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:108
+#: apt-cdrom.8.xml:95
 msgid ""
 "Rename a disc; change the label of a disk or override the disks given label. "
 "This option will cause <command>apt-cdrom</command> to prompt for a new "
@@ -1758,17 +1802,17 @@ msgstr ""
 "Konfigurationselement: <literal>APT::CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116 apt-get.8.xml:375
+#: apt-cdrom.8.xml:103 apt-get.8.xml:292
 msgid "<option>-m</option>"
 msgstr "<option>-m</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116
+#: apt-cdrom.8.xml:103
 msgid "<option>--no-mount</option>"
 msgstr "<option>--no-mount</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:117
+#: apt-cdrom.8.xml:104
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -1779,12 +1823,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:124
+#: apt-cdrom.8.xml:111
 msgid "<option>--fast</option>"
 msgstr "<option>--fast</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:125
+#: apt-cdrom.8.xml:112
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1797,12 +1841,12 @@ msgstr ""
 "festgestellt hat. Konfigurationselement: <literal>APT::CDROM::Fast</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:134
+#: apt-cdrom.8.xml:121
 msgid "<option>--thorough</option>"
 msgstr "<option>--thorough</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:135
+#: apt-cdrom.8.xml:122
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1813,22 +1857,22 @@ msgstr ""
 "Dies verlängert das Durchsuchen des Mediums deutlich, nimmt aber alle auf."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:143 apt-get.8.xml:406
+#: apt-cdrom.8.xml:130 apt-get.8.xml:323
 msgid "<option>--just-print</option>"
 msgstr "<option>--just-print</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:144 apt-get.8.xml:408
+#: apt-cdrom.8.xml:131 apt-get.8.xml:325
 msgid "<option>--recon</option>"
 msgstr "<option>--recon</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:145 apt-get.8.xml:409
+#: apt-cdrom.8.xml:132 apt-get.8.xml:326
 msgid "<option>--no-act</option>"
 msgstr "<option>--no-act</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:133
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -1839,12 +1883,12 @@ msgstr ""
 "Konfigurationselement: <literal>APT::CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:159
+#: apt-cdrom.8.xml:146
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:164
+#: apt-cdrom.8.xml:151
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1873,21 +1917,8 @@ msgstr "apt-config"
 msgid "APT Configuration Query program"
 msgstr "APT-Konfigurationsabfrageprogramm"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-config.8.xml:39
-msgid ""
-"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>shell</arg> <arg>dump</arg> </group>"
-msgstr ""
-"<command>apt-config</command><arg><option>-hv</option></arg><arg><option>-"
-"o=<replaceable>Konfigurationszeichenkette</replaceable></option></"
-"arg><arg><option>-c=<replaceable>Datei</replaceable></option></arg><group "
-"choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:51
+#: apt-config.8.xml:39
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -1901,7 +1932,7 @@ msgstr ""
 "Anwendungen zu benutzen ist."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:56 apt-ftparchive.1.xml:75
+#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present."
@@ -1910,12 +1941,12 @@ msgstr ""
 "angegeben wurde, muss einer der Befehle unterhalb vorkommen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:49
 msgid "shell"
 msgstr "shell"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:63
+#: apt-config.8.xml:51
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
@@ -1930,7 +1961,7 @@ msgstr ""
 "auf. In einen Shellskript sollte es wie folgt benutzt werden:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:71
+#: apt-config.8.xml:59
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -1942,7 +1973,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:76
+#: apt-config.8.xml:64
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -1951,7 +1982,7 @@ msgstr ""
 "mit einer Vorgabe von <option>-f</option> setzen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:80
+#: apt-config.8.xml:68
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -1963,18 +1994,18 @@ msgstr ""
 "intern geprüft."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:89
+#: apt-config.8.xml:77
 msgid "Just show the contents of the configuration space."
 msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
-#: apt-sortpkgs.1.xml:73
+#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112
+#: apt-config.8.xml:100
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1999,21 +2030,8 @@ msgstr ""
 "Hilfsprogramm zum Extrahieren der DebConf-Konfiguration und Schablonen von "
 "Debian-Paketen"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-extracttemplates.1.xml:39
-msgid ""
-"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-"<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
-"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
-"arg>"
-msgstr ""
-"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-"<arg><option>-t=<replaceable>temporäres Verzeichnis</replaceable></option></"
-"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>Datei</replaceable></"
-"arg>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:39
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -2029,12 +2047,12 @@ msgstr ""
 "generiert:"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:52
+#: apt-extracttemplates.1.xml:44
 msgid "package version template-file config-script"
 msgstr "Paket Version Schablonendatei Konfigurationsskript"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:53
+#: apt-extracttemplates.1.xml:45
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
@@ -2048,17 +2066,17 @@ msgstr ""
 "XXXX</filename> angegeben wurde"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63 apt-get.8.xml:525
+#: apt-extracttemplates.1.xml:55 apt-get.8.xml:447
 msgid "<option>-t</option>"
 msgstr "<option>-t</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63
+#: apt-extracttemplates.1.xml:55
 msgid "<option>--tempdir</option>"
 msgstr "<option>--tempdir</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:65
+#: apt-extracttemplates.1.xml:57
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@ -2069,7 +2087,7 @@ msgstr ""
 "<literal>APT::ExtractTemplates::TempDir</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:82
+#: apt-extracttemplates.1.xml:74
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -2097,51 +2115,8 @@ msgstr "apt-ftparchive"
 msgid "Utility to generate index files"
 msgstr "Hilfsprogramm zum Generieren von Indexdateien"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-ftparchive.1.xml:39
-msgid ""
-"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
-"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
-"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
-"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-"replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
-"arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
-"arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
-"replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
-"\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
-msgstr ""
-"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-"arg> <arg><option>--arch <replaceable>Architektur</replaceable></option></"
-"arg> <arg><option>-o <replaceable>Konfiguration</"
-"replaceable>=<replaceable>Zeichenkette</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>Datei</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>Pfad</replaceable></arg><arg><replaceable>überschreiben</"
-"replaceable><arg><replaceable>Pfad-Präfix</replaceable></arg></arg></arg> "
-"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>Pfad</"
-"replaceable></arg><arg><replaceable>überschreiben</"
-"replaceable><arg><replaceable>Pfad-Präfix</replaceable></arg></arg></arg> "
-"<arg>contents <arg choice=\"plain\"><replaceable>Pfad</replaceable></arg></"
-"arg> <arg>release <arg choice=\"plain\"><replaceable>Pfad</replaceable></"
-"arg></arg> <arg>generate <arg choice=\"plain"
-"\"><replaceable>Konfigurationsdatei</replaceable></arg> <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>Abschnitt</replaceable></arg></arg> "
-"<arg>clean <arg choice=\"plain\"><replaceable>Konfigurationsdatei</"
-"replaceable></arg></arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -2154,7 +2129,7 @@ msgstr ""
 "Inhalts dieser Stelle generiert werden."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:64
+#: apt-ftparchive.1.xml:43
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -2168,7 +2143,7 @@ msgstr ""
 "für ein komplettes Archiv zu »skripten«."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:70
+#: apt-ftparchive.1.xml:49
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -2184,12 +2159,12 @@ msgstr ""
 "Ausgabedateien erzeugt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:79
+#: apt-ftparchive.1.xml:58
 msgid "packages"
 msgstr "packages"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:81
+#: apt-ftparchive.1.xml:60
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -2202,7 +2177,7 @@ msgstr ""
 "Befehl entspricht etwa &dpkg-scanpackages;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
+#: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
@@ -2210,12 +2185,12 @@ msgstr ""
 "Zwischenspeichern von Programmen anzugeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:89
+#: apt-ftparchive.1.xml:68
 msgid "sources"
 msgstr "sources"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:70
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -2228,7 +2203,7 @@ msgstr ""
 "stdout ausgibt. Dieser Befehl entspricht etwa &dpkg-scansources;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:75
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -2240,12 +2215,12 @@ msgstr ""
 "ändern."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:101
+#: apt-ftparchive.1.xml:80
 msgid "contents"
 msgstr "contents"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:103
+#: apt-ftparchive.1.xml:82
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -2263,12 +2238,12 @@ msgstr ""
 "getrennt in der Ausgabe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:113
+#: apt-ftparchive.1.xml:92
 msgid "release"
 msgstr "release"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:115
+#: apt-ftparchive.1.xml:94
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -2295,7 +2270,7 @@ msgstr ""
 "enthält."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:125
+#: apt-ftparchive.1.xml:104
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -2316,12 +2291,12 @@ msgstr ""
 "<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:115
 msgid "generate"
 msgstr "generate"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:138
+#: apt-ftparchive.1.xml:117
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -2337,12 +2312,12 @@ msgstr ""
 "Verwaltung der erforderlichen Einstellungen bereitstellt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
+#: apt-ftparchive.1.xml:124 apt-get.8.xml:215
 msgid "clean"
 msgstr "clean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:126
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -2352,12 +2327,12 @@ msgstr ""
 "Datensätze entfernt."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:153
+#: apt-ftparchive.1.xml:132
 msgid "The Generate Configuration"
 msgstr "Die Generate-Konfiguration"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:134
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -2375,7 +2350,7 @@ msgstr ""
 "wenn die Markierung »scope« behandelt wird."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:163
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
@@ -2383,12 +2358,12 @@ msgstr ""
 "unterhalb beschrieben"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:144
 msgid "Dir Section"
 msgstr "Dir-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:146
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -2402,12 +2377,12 @@ msgstr ""
 "absoluten Pfad zu bilden."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:151
 msgid "ArchiveDir"
 msgstr "ArchiveDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:153
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2418,32 +2393,32 @@ msgstr ""
 "enthält."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:179
+#: apt-ftparchive.1.xml:158
 msgid "OverrideDir"
 msgstr "OverrideDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:160
 msgid "Specifies the location of the override files."
 msgstr "Gibt den Ort der Override-Dateien an"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:184
+#: apt-ftparchive.1.xml:163
 msgid "CacheDir"
 msgstr "CacheDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:165
 msgid "Specifies the location of the cache files"
 msgstr "Gibt den Ort der Zwischenspeicherdateien an"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:189
+#: apt-ftparchive.1.xml:168
 msgid "FileListDir"
 msgstr "FileListDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:170
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -2452,12 +2427,12 @@ msgstr ""
 "unterhalb gesetzt ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:176
 msgid "Default Section"
 msgstr "Vorgabe-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:199
+#: apt-ftparchive.1.xml:178
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -2468,12 +2443,12 @@ msgstr ""
 "können diese Vorgaben mit einer Einstellung pro Abschnitt überschreiben."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
+#: apt-ftparchive.1.xml:182
 msgid "Packages::Compress"
 msgstr "Packages::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:184
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -2487,12 +2462,12 @@ msgstr ""
 "ist ». gzip«."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:190
 msgid "Packages::Extensions"
 msgstr "Packages::Extensions"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:213
+#: apt-ftparchive.1.xml:192
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -2501,12 +2476,12 @@ msgstr ""
 "Vorgabe ist ».deb«."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:196
 msgid "Sources::Compress"
 msgstr "Sources::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:219
+#: apt-ftparchive.1.xml:198
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -2515,12 +2490,12 @@ msgstr ""
 "Kompression der Quelldateien steuert."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:202
 msgid "Sources::Extensions"
 msgstr "Sources::Extensions"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:225
+#: apt-ftparchive.1.xml:204
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -2529,12 +2504,12 @@ msgstr ""
 "Vorgabe ist ».dsc«."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:208
 msgid "Contents::Compress"
 msgstr "Contents::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:210
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -2543,12 +2518,12 @@ msgstr ""
 "Kompression der Inhaltsdateien steuert."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:214
 msgid "Translation::Compress"
 msgstr "Translation::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:237
+#: apt-ftparchive.1.xml:216
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
@@ -2557,12 +2532,12 @@ msgstr ""
 "Kompression der Translation-en-Hauptdatei steuert."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
+#: apt-ftparchive.1.xml:220
 msgid "DeLinkLimit"
 msgstr "DeLinkLimit"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:222
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -2573,12 +2548,12 @@ msgstr ""
 "<literal>External-Links</literal>-Einstellung pro Abschnitt benutzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248
+#: apt-ftparchive.1.xml:227
 msgid "FileMode"
 msgstr "FileMode"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:229
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
@@ -2587,12 +2562,12 @@ msgstr ""
 "Indexdateien werden ohne Beachtung von umask auf diese Rechte gesetzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
+#: apt-ftparchive.1.xml:234 apt-ftparchive.1.xml:380
 msgid "LongDescription"
 msgstr "LongDescription"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+#: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
@@ -2601,12 +2576,12 @@ msgstr ""
 "werden oder in eine Translation-en-Hauptdatei unterteilt werden sollen."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:263
+#: apt-ftparchive.1.xml:242
 msgid "TreeDefault Section"
 msgstr "TreeDefault-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml:244
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -2617,12 +2592,12 @@ msgstr ""
 "$(SECTION) und $(ARCH) durch ihre jeweiligen Werte ersetzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:249
 msgid "MaxContentsChange"
 msgstr "MaxContentsChange"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:272
+#: apt-ftparchive.1.xml:251
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -2633,12 +2608,12 @@ msgstr ""
 "Tage alle neu gebildet werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:256
 msgid "ContentsAge"
 msgstr "ContentsAge"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:279
+#: apt-ftparchive.1.xml:258
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -2656,12 +2631,12 @@ msgstr ""
 "eine neue Datei benötigen. Die Vorgabe ist 10, die Einheiten sind Tage."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:267
 msgid "Directory"
 msgstr "Directory"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:290
+#: apt-ftparchive.1.xml:269
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -2670,12 +2645,12 @@ msgstr ""
 "$(SECTION)/binary-$(ARCH)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:273
 msgid "SrcDirectory"
 msgstr "SrcDirectory"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:296
+#: apt-ftparchive.1.xml:275
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -2684,12 +2659,12 @@ msgstr ""
 "$(DIST)/$(SECTION)/source/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:418
 msgid "Packages"
 msgstr "Packages"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:281
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -2698,12 +2673,12 @@ msgstr ""
 "binary-$(ARCH)/Packages</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:306 apt-ftparchive.1.xml:444
+#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:423
 msgid "Sources"
 msgstr "Sources"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:287
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -2712,12 +2687,12 @@ msgstr ""
 "source/Sources</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
+#: apt-ftparchive.1.xml:291
 msgid "Translation"
 msgstr "Übersetzung"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:293
 msgid ""
 "Set the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
@@ -2728,12 +2703,12 @@ msgstr ""
 "ist <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319
+#: apt-ftparchive.1.xml:298
 msgid "InternalPrefix"
 msgstr "InternalPrefix"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:300
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -2744,12 +2719,12 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:305 apt-ftparchive.1.xml:429
 msgid "Contents"
 msgstr "Contents"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:307
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
@@ -2763,22 +2738,22 @@ msgstr ""
 "automatisch integrieren."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:314
 msgid "Contents::Header"
 msgstr "Contents::Header"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:316
 msgid "Sets header file to prepend to the contents output."
 msgstr "Setzt die Kopfdatendatei, um sie der Inhaltsausgabe voranzustellen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:340 apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:454
 msgid "BinCacheDB"
 msgstr "BinCacheDB"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:342
+#: apt-ftparchive.1.xml:321
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -2787,12 +2762,12 @@ msgstr ""
 "Abschnitt. Mehrere Abschnitte können sich die gleiche Datenbank teilen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:325
 msgid "FileList"
 msgstr "FileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:327
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -2803,12 +2778,12 @@ msgstr ""
 "Relativen Dateinamen wird das Archivverzeichnis vorangestellt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:353
+#: apt-ftparchive.1.xml:332
 msgid "SourceFileList"
 msgstr "SourceFileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:355
+#: apt-ftparchive.1.xml:334
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -2821,12 +2796,12 @@ msgstr ""
 "benutzt, wenn Quellindizes verarbeitet werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:342
 msgid "Tree Section"
 msgstr "Tree-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:365
+#: apt-ftparchive.1.xml:344
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -2841,7 +2816,7 @@ msgstr ""
 "<literal>Directory</literal>-Ersetzungsvariable definiert."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:349
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -2855,7 +2830,7 @@ msgstr ""
 "codename;</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:375
+#: apt-ftparchive.1.xml:354
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
@@ -2866,7 +2841,7 @@ msgstr ""
 "Variablen benutzt werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:381
+#: apt-ftparchive.1.xml:360
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -2880,7 +2855,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:378
+#: apt-ftparchive.1.xml:357
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -2891,12 +2866,12 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
+#: apt-ftparchive.1.xml:366
 msgid "Sections"
 msgstr "Abschnitte"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389
+#: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"
@@ -2907,12 +2882,12 @@ msgstr ""
 "non-free</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
+#: apt-ftparchive.1.xml:373 apt.conf.5.xml:157
 msgid "Architectures"
 msgstr "Architekturen"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:375
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -2923,12 +2898,12 @@ msgstr ""
 "benutzt, um anzugeben, dass dieser Baum ein Quellarchiv besitzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:434
 msgid "BinOverride"
 msgstr "BinOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:388
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -2937,12 +2912,12 @@ msgstr ""
 "Priorität und Adressinformationen des Betreuers."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:439
 msgid "SrcOverride"
 msgstr "SrcOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:415
+#: apt-ftparchive.1.xml:394
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -2951,32 +2926,32 @@ msgstr ""
 "Abschnittsinformationen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
+#: apt-ftparchive.1.xml:398 apt-ftparchive.1.xml:444
 msgid "ExtraOverride"
 msgstr "ExtraOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
 msgid "Sets the binary extra override file."
 msgstr "Setzt die zusätzliche Programm-Override-Datei."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:424 apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:403 apt-ftparchive.1.xml:449
 msgid "SrcExtraOverride"
 msgstr "SrcExtraOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
+#: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
 msgid "Sets the source extra override file."
 msgstr "Setzt die zusätzliche Quell-Override-Datei."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:431
+#: apt-ftparchive.1.xml:410
 msgid "BinDirectory Section"
 msgstr "BinDirectory-Abschnitt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:412
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -2991,12 +2966,12 @@ msgstr ""
 "<literal>Abschnitt</literal><literal>Architektur</literal> ähnlich."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:441
+#: apt-ftparchive.1.xml:420
 msgid "Sets the Packages file output."
 msgstr "Setzt die Packages-Dateiausgabe."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:446
+#: apt-ftparchive.1.xml:425
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -3005,52 +2980,52 @@ msgstr ""
 "<literal>Sources</literal> ist erforderlich."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml:431
 msgid "Sets the Contents file output. (optional)"
 msgstr "Setzt die Contents-Dateiausgabe. (optional)"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:457
+#: apt-ftparchive.1.xml:436
 msgid "Sets the binary override file."
 msgstr "Setzt die Programm-Override-Datei."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:441
 msgid "Sets the source override file."
 msgstr "Setzt die Quell-Override-Datei."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:477
+#: apt-ftparchive.1.xml:456
 msgid "Sets the cache DB."
 msgstr "Setzt die Zwischenspeicherdatenbank."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:459
 msgid "PathPrefix"
 msgstr "PathPrefix"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:461
 msgid "Appends a path to all the output paths."
 msgstr "Hängt einen Pfad an alle Ausgabepfade an."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:464
 msgid "FileList, SourceFileList"
 msgstr "FileList, SourceFileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:466
 msgid "Specifies the file list file."
 msgstr "Gibt die Dateilistendatei an."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:473
 msgid "The Binary Override File"
 msgstr "Die Programm-Override-Datei "
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:495
+#: apt-ftparchive.1.xml:474
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -3065,19 +3040,19 @@ msgstr ""
 "und das letzte Feld ist das Betreuerumsetzungsfeld."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:480
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "alt [// oldn]* => neu"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:482
 #, no-wrap
 msgid "new"
 msgstr "neu"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:500
+#: apt-ftparchive.1.xml:479
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3094,12 +3069,12 @@ msgstr ""
 "bedingungslos."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:490
 msgid "The Source Override File"
 msgstr "Die Quell-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:513
+#: apt-ftparchive.1.xml:492
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -3110,12 +3085,12 @@ msgstr ""
 "Quellpaketname, das zweite ist der Abschnitt, dem er zugeordnet ist."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:497
 msgid "The Extra Override File"
 msgstr "Die zusätzlich Override-Datei"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:520
+#: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -3127,14 +3102,26 @@ msgstr ""
 "ist der neue Wert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:508
 msgid ""
 "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
 msgstr ""
 "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml:510
+#, fuzzy
+#| msgid ""
+#| "Generate the given checksum. These options default to on, when turned off "
+#| "the generated index files will not have the checksum fields where "
+#| "possible.  Configuration Items: <literal>APT::FTPArchive::"
+#| "<replaceable>Checksum</replaceable></literal> and <literal>APT::"
+#| "FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</"
+#| "replaceable></literal> where <literal><replaceable>Index</replaceable></"
+#| "literal> can be <literal>Packages</literal>, <literal>Sources</literal> "
+#| "or <literal>Release</literal> and <literal><replaceable>Checksum</"
+#| "replaceable></literal> can be <literal>MD5</literal>, <literal>SHA1</"
+#| "literal> or <literal>SHA256</literal>."
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -3159,12 +3146,12 @@ msgstr ""
 "literal> sein kann."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:540
+#: apt-ftparchive.1.xml:519
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:521
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3174,7 +3161,7 @@ msgstr ""
 "DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:548
+#: apt-ftparchive.1.xml:527
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3188,12 +3175,12 @@ msgstr ""
 "Konfigurationselement: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:554
+#: apt-ftparchive.1.xml:533
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:556
+#: apt-ftparchive.1.xml:535
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3207,12 +3194,12 @@ msgstr ""
 "DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:562
+#: apt-ftparchive.1.xml:541
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:564
+#: apt-ftparchive.1.xml:543
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3228,12 +3215,12 @@ msgstr ""
 "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:572
+#: apt-ftparchive.1.xml:551
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:553
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3244,12 +3231,12 @@ msgstr ""
 "SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:578
+#: apt-ftparchive.1.xml:557
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:559
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3258,12 +3245,12 @@ msgstr ""
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:584
+#: apt-ftparchive.1.xml:563
 msgid "<option>--arch</option>"
 msgstr "<option>--arch</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:585
+#: apt-ftparchive.1.xml:564
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3277,12 +3264,12 @@ msgstr ""
 "Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:591
+#: apt-ftparchive.1.xml:570
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:593
+#: apt-ftparchive.1.xml:572
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3306,12 +3293,12 @@ msgstr ""
 "haben sollte und all diese zusätzlichen Prüfungen daher nutzlos sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:603
+#: apt-ftparchive.1.xml:582
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:605
+#: apt-ftparchive.1.xml:584
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3327,19 +3314,19 @@ msgstr ""
 "werden kann."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544
-#: sources.list.5.xml:209
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1104 apt_preferences.5.xml:544
+#: sources.list.5.xml:214
 msgid "Examples"
 msgstr "Beispiele"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:623
+#: apt-ftparchive.1.xml:602
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:619
+#: apt-ftparchive.1.xml:598
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3349,7 +3336,7 @@ msgstr ""
 ">"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:633
+#: apt-ftparchive.1.xml:612
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3377,68 +3364,8 @@ msgstr "apt-get"
 msgid "APT package handling utility -- command-line interface"
 msgstr "APT-Werkzeug für den Umgang mit Paketen -- Befehlszeilenschnittstelle"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-get.8.xml:39
-msgid ""
-"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
-"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
-"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
-"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> "
-"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice="
-"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
-"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
-"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
-"arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
-"<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-"<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
-"</group> </arg> </group>"
-msgstr ""
-"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>Konfigurationszeichenkette</replaceable> </option> "
-"</arg> <arg> <option>-c= <replaceable>Konfigurationsdatei</replaceable> "
-"</option> </arg> <arg> <option>-t=</option> <arg choice='plain'> "
-"<replaceable>Ziel-Release</replaceable> </arg> </arg> <arg> "
-"<option>-a=</option> <arg choice='plain'> "
-"<replaceable>Vorgabearchitektur</replaceable> </arg> </arg> <group choice="
-"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
-"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
-"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>Paket</replaceable> <arg> <group choice='req'> <arg "
-"choice='plain'> =<replaceable>Paket-Versionsnummer</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>Ziel-Release</replaceable> </arg> </group> </"
-"arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>Paket</replaceable></arg></arg> <arg "
-"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</"
-"replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>Paket</replaceable> <arg> <group choice='req'> "
-"<arg choice='plain'> =<replaceable>Paket-Versionsnummer</replaceable> </arg> "
-"<arg choice='plain'> /<replaceable>Ziel-Release</replaceable> </arg> </"
-"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> <arg "
-"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
-"</group> </arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:122
+#: apt-get.8.xml:39
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
@@ -3451,12 +3378,12 @@ msgstr ""
 "Oberflächenschnittstellen, wie &dselect;, &aptitude;, &synaptic; und &wajig;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:131 apt-key.8.xml:127
+#: apt-get.8.xml:48 apt-key.8.xml:119
 msgid "update"
 msgstr "update"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:132
+#: apt-get.8.xml:49
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -3480,12 +3407,12 @@ msgstr ""
 "Größe der Pakete nicht im voraus bekannt ist."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:143 guide.sgml:121
+#: apt-get.8.xml:60 guide.sgml:121
 msgid "upgrade"
 msgstr "upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:144
+#: apt-get.8.xml:61
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -3511,12 +3438,12 @@ msgstr ""
 "get</command> die neuen Versionen der verfügbaren Pakete kennt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:156
+#: apt-get.8.xml:73
 msgid "dselect-upgrade"
 msgstr "dselect-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:157
+#: apt-get.8.xml:74
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -3533,12 +3460,12 @@ msgstr ""
 "Installieren von neuen Paketen)."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:166 guide.sgml:140
+#: apt-get.8.xml:83 guide.sgml:140
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:167
+#: apt-get.8.xml:84
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3562,12 +3489,12 @@ msgstr ""
 "überschreiben der allgemeinen Einstellungen für einzelne Pakete."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:179 guide.sgml:131
+#: apt-get.8.xml:96 guide.sgml:131
 msgid "install"
 msgstr "install"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:181
+#: apt-get.8.xml:98
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -3596,7 +3523,7 @@ msgstr ""
 "vom Konfliktauflösungssystem von apt-get getroffen wurden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:116
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -3614,7 +3541,7 @@ msgstr ""
 "ausgewählt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:123
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -3623,7 +3550,7 @@ msgstr ""
 "durchführen und müssen mit Vorsicht gehandhabt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:209
+#: apt-get.8.xml:126
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -3644,7 +3571,7 @@ msgstr ""
 "heruntergeladen und installiert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:220
+#: apt-get.8.xml:137
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -3653,7 +3580,7 @@ msgstr ""
 "alternative Installationsrichtlinie für eigene Pakete zu erzeugen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:141
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -3673,12 +3600,12 @@ msgstr ""
 "Zeichen, um genauere reguläre Ausdruck zu erstellen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:233
+#: apt-get.8.xml:150
 msgid "remove"
 msgstr "remove"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:151
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -3693,12 +3620,12 @@ msgstr ""
 "Leerzeichen dazwischen) wird das erkannte Paket installiert anstatt entfernt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:241
+#: apt-get.8.xml:158
 msgid "purge"
 msgstr "purge"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:242
+#: apt-get.8.xml:159
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -3709,12 +3636,12 @@ msgstr ""
 "Konfigurationsdateien werden mitgelöscht)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:163
 msgid "source"
 msgstr "source"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:247
+#: apt-get.8.xml:164
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -3734,7 +3661,7 @@ msgstr ""
 "wurde, wenn möglich."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:255
+#: apt-get.8.xml:172
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> type lines in the &sources-list; file. This means that you "
@@ -3750,7 +3677,14 @@ msgstr ""
 "installiert haben oder installieren könnten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:179
+#, fuzzy
+#| msgid ""
+#| "If the <option>--compile</option> option is specified then the package "
+#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
+#| "command> for the architecture as defined by the <command>--host-"
+#| "architecture</command> option.  If <option>--download-only</option> is "
+#| "specified then the source package will not be unpacked."
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -3765,7 +3699,7 @@ msgstr ""
 "angegeben ist, wird das Quellpaket nicht entpackt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:186
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -3781,7 +3715,7 @@ msgstr ""
 "literal>-Option."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:275
+#: apt-get.8.xml:192
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -3792,12 +3726,19 @@ msgstr ""
 "heruntergeladenen Tarballs ähnlich."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:280
+#: apt-get.8.xml:197
 msgid "build-dep"
 msgstr "build-dep"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:281
+#: apt-get.8.xml:198
+#, fuzzy
+#| msgid ""
+#| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
+#| "an attempt to satisfy the build dependencies for a source package. By "
+#| "default the dependencies are satisfied to build the package natively. If "
+#| "desired a host-architecture can be specified with the <option>--host-"
+#| "architecture</option> option instead."
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -3813,12 +3754,12 @@ msgstr ""
 "angegeben werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
+#: apt-get.8.xml:204
 msgid "check"
 msgstr "check"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:205
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -3827,12 +3768,16 @@ msgstr ""
 "Paketzwischenspeicher und prüft, ob beschädigte Abhängigkeiten vorliegen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:209
 msgid "download"
 msgstr "download"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:210
+#, fuzzy
+#| msgid ""
+#| "<literal>download</literal> will download the given binary package into "
+#| "the current directory."
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
@@ -3841,7 +3786,7 @@ msgstr ""
 "Verzeichnis herunterladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:299
+#: apt-get.8.xml:216
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -3860,12 +3805,12 @@ msgstr ""
 "Zeit zu Zeit ausführen, um Plattenplatz freizugeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:225
 msgid "autoclean"
 msgstr "autoclean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:309
+#: apt-get.8.xml:226
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -3885,12 +3830,17 @@ msgstr ""
 "sie auf »off« gesetzt ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:318
+#: apt-get.8.xml:235
 msgid "autoremove"
 msgstr "autoremove"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
+#: apt-get.8.xml:236
+#, fuzzy
+#| msgid ""
+#| "<literal>autoremove</literal> is used to remove packages that were "
+#| "automatically installed to satisfy dependencies for other packages and "
+#| "are now no longer needed."
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -3901,12 +3851,12 @@ msgstr ""
 "erfüllen und die nicht mehr benötigt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323
+#: apt-get.8.xml:240
 msgid "changelog"
 msgstr "changelog"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:241
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -3927,12 +3877,12 @@ msgstr ""
 "Befehl <option>install</option> angeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:346
+#: apt-get.8.xml:263
 msgid "<option>--no-install-recommends</option>"
 msgstr "<option>--no-install-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:264
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -3941,12 +3891,12 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:351
+#: apt-get.8.xml:268
 msgid "<option>--install-suggests</option>"
 msgstr "<option>--install-suggests</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml:269
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
@@ -3955,12 +3905,12 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Install-Suggests</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:356
+#: apt-get.8.xml:273
 msgid "<option>--download-only</option>"
 msgstr "<option>--download-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:357
+#: apt-get.8.xml:274
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -3970,12 +3920,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:361
+#: apt-get.8.xml:278
 msgid "<option>--fix-broken</option>"
 msgstr "<option>--fix-broken</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:362
+#: apt-get.8.xml:279
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
@@ -4004,17 +3954,17 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:375
+#: apt-get.8.xml:292
 msgid "<option>--ignore-missing</option>"
 msgstr "<option>--ignore-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:376
+#: apt-get.8.xml:293
 msgid "<option>--fix-missing</option>"
 msgstr "<option>--fix-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:294
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -4035,12 +3985,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:387
+#: apt-get.8.xml:304
 msgid "<option>--no-download</option>"
 msgstr "<option>--no-download</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:388
+#: apt-get.8.xml:305
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -4052,7 +4002,7 @@ msgstr ""
 "<literal>APT::Get::Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:395
+#: apt-get.8.xml:312
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -4072,17 +4022,17 @@ msgstr ""
 "Konfigurationselement: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:405
+#: apt-get.8.xml:322
 msgid "<option>--simulate</option>"
 msgstr "<option>--simulate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:407
+#: apt-get.8.xml:324
 msgid "<option>--dry-run</option>"
 msgstr "<option>--dry-run</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:410
+#: apt-get.8.xml:327
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -4093,7 +4043,7 @@ msgstr ""
 "<literal>APT::Get::Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:331
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "
@@ -4111,7 +4061,7 @@ msgstr ""
 "Warnungen von <literal>apt-get</literal> wissen, was er tut)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:337
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4124,22 +4074,22 @@ msgstr ""
 "eckiger Klammern bedeutet Unterbrechungen, die keine Folgen haben (selten)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:344
 msgid "<option>-y</option>"
 msgstr "<option>-y</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:344
 msgid "<option>--yes</option>"
 msgstr "<option>--yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:428
+#: apt-get.8.xml:345
 msgid "<option>--assume-yes</option>"
 msgstr "<option>--assume-yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:429
+#: apt-get.8.xml:346
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -4155,17 +4105,37 @@ msgstr ""
 "Get::Assume-Yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:353
+#, fuzzy
+#| msgid "<option>--assume-yes</option>"
+msgid "<option>--assume-no</option>"
+msgstr "<option>--assume-yes</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:354
+#, fuzzy
+#| msgid ""
+#| "Compile source packages after downloading them.  Configuration Item: "
+#| "<literal>APT::Get::Compile</literal>."
+msgid ""
+"Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
+"Assume-No</literal>."
+msgstr ""
+"Kompiliert Quellpakete, nachdem sie heruntergeladen wurden. "
+"Konfigurationselement: <literal>APT::Get::Compile</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:358
 msgid "<option>-u</option>"
 msgstr "<option>-u</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:358
 msgid "<option>--show-upgraded</option>"
 msgstr "<option>--show-upgraded</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:437
+#: apt-get.8.xml:359
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4175,17 +4145,17 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Show-Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:364
 msgid "<option>-V</option>"
 msgstr "<option>-V</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:364
 msgid "<option>--verbose-versions</option>"
 msgstr "<option>--verbose-versions</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:365
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -4195,17 +4165,17 @@ msgstr ""
 "Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:370
 msgid "<option>--host-architecture</option>"
 msgstr "<option>--host-architecture</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:371
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
-"satisfied. By default is it not set which means that the host architecture is "
-"the same as the build architecture (which is defined by <literal>APT::"
+"satisfied. By default is it not set which means that the host architecture "
+"is the same as the build architecture (which is defined by <literal>APT::"
 "Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
 "Architecture</literal>"
 msgstr ""
@@ -4213,26 +4183,26 @@ msgstr ""
 "source --compile</command> gebaut und wie Cross-Bau-Abhängigkeiten erfüllt "
 "werden. Standardmäßig ist sie nicht gesetze, was bedeutet, dass die "
 "Rechnerarchitektur die gleiche wie die Bau-Architektur ist (die durch "
-"<literal>APT::Architecture</literal>) definiert wird). Konfigurationselement: "
-"<literal>APT::Get::Host-Architecture</literal>"
+"<literal>APT::Architecture</literal>) definiert wird). "
+"Konfigurationselement: <literal>APT::Get::Host-Architecture</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:379
 msgid "<option>-b</option>"
 msgstr "<option>-b</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:379
 msgid "<option>--compile</option>"
 msgstr "<option>--compile</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:458
+#: apt-get.8.xml:380
 msgid "<option>--build</option>"
 msgstr "<option>--build</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:459
+#: apt-get.8.xml:381
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -4241,12 +4211,12 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:385
 msgid "<option>--ignore-hold</option>"
 msgstr "<option>--ignore-hold</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:464
+#: apt-get.8.xml:386
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -4260,12 +4230,12 @@ msgstr ""
 "<literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:470
+#: apt-get.8.xml:392
 msgid "<option>--no-upgrade</option>"
 msgstr "<option>--no-upgrade</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:393
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4279,12 +4249,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:477
+#: apt-get.8.xml:399
 msgid "<option>--only-upgrade</option>"
 msgstr "<option>--only-upgrade</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:478
+#: apt-get.8.xml:400
 msgid ""
 "Do not install new packages; When used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will prevent packages on the "
@@ -4298,12 +4268,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:484
+#: apt-get.8.xml:406
 msgid "<option>--force-yes</option>"
 msgstr "<option>--force-yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:485
+#: apt-get.8.xml:407
 msgid ""
 "Force yes; This is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -4318,12 +4288,12 @@ msgstr ""
 "zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:492
+#: apt-get.8.xml:414
 msgid "<option>--print-uris</option>"
 msgstr "<option>--print-uris</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:493
+#: apt-get.8.xml:415
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected md5 "
@@ -4345,12 +4315,12 @@ msgstr ""
 "Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:503
+#: apt-get.8.xml:425
 msgid "<option>--purge</option>"
 msgstr "<option>--purge</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:504
+#: apt-get.8.xml:426
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -4363,12 +4333,12 @@ msgstr ""
 "option>. Konfigurationselement: <literal>APT::Get::Purge</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
+#: apt-get.8.xml:433
 msgid "<option>--reinstall</option>"
 msgstr "<option>--reinstall</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:434
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4377,12 +4347,12 @@ msgstr ""
 "Version sind. Konfigurationselement: <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:516
+#: apt-get.8.xml:438
 msgid "<option>--list-cleanup</option>"
 msgstr "<option>--list-cleanup</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:517
+#: apt-get.8.xml:439
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -4400,17 +4370,17 @@ msgstr ""
 "Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:448
 msgid "<option>--target-release</option>"
 msgstr "<option>--target-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:527
+#: apt-get.8.xml:449
 msgid "<option>--default-release</option>"
 msgstr "<option>--default-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:450
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -4435,12 +4405,12 @@ msgstr ""
 "auch die &apt-preferences;-Handbuchseite."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:541
+#: apt-get.8.xml:463
 msgid "<option>--trivial-only</option>"
 msgstr "<option>--trivial-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:465
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4454,12 +4424,12 @@ msgstr ""
 "Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
+#: apt-get.8.xml:471
 msgid "<option>--no-remove</option>"
 msgstr "<option>--no-remove</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:550
+#: apt-get.8.xml:472
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4468,12 +4438,12 @@ msgstr ""
 "Nachfrage ab. Konfigurationselement: <literal>APT::Get::Remove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:477
 msgid "<option>--auto-remove</option>"
 msgstr "<option>--auto-remove</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:556
+#: apt-get.8.xml:478
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4487,12 +4457,12 @@ msgstr ""
 "AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:562
+#: apt-get.8.xml:484
 msgid "<option>--only-source</option>"
 msgstr "<option>--only-source</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:563
+#: apt-get.8.xml:485
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -4511,22 +4481,22 @@ msgstr ""
 "Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--diff-only</option>"
 msgstr "<option>--diff-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--dsc-only</option>"
 msgstr "<option>--dsc-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--tar-only</option>"
 msgstr "<option>--tar-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:574
+#: apt-get.8.xml:496
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4538,12 +4508,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:579
+#: apt-get.8.xml:501
 msgid "<option>--arch-only</option>"
 msgstr "<option>--arch-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:580
+#: apt-get.8.xml:502
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -4552,12 +4522,12 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Arch-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:584
+#: apt-get.8.xml:506
 msgid "<option>--allow-unauthenticated</option>"
 msgstr "<option>--allow-unauthenticated</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:585
+#: apt-get.8.xml:507
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -4568,7 +4538,7 @@ msgstr ""
 "<literal>APT::Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:598
+#: apt-get.8.xml:520
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
@@ -4577,7 +4547,7 @@ msgstr ""
 "&file-statelists;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:607
+#: apt-get.8.xml:529
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -4588,7 +4558,7 @@ msgstr ""
 "preferences;, das APT-Howto."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:613
+#: apt-get.8.xml:535
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -4597,22 +4567,22 @@ msgstr ""
 "100 bei Fehlern."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:616
+#: apt-get.8.xml:538
 msgid "ORIGINAL AUTHORS"
 msgstr "ORIGINALAUTOREN"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:617
+#: apt-get.8.xml:539
 msgid "&apt-author.jgunthorpe;"
 msgstr "&apt-author.jgunthorpe;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:620
+#: apt-get.8.xml:542
 msgid "CURRENT AUTHORS"
 msgstr "AKTUELLE AUTOREN"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:622
+#: apt-get.8.xml:544
 msgid "&apt-author.team;"
 msgstr "&apt-author.team;"
 
@@ -4626,21 +4596,8 @@ msgstr "apt-key"
 msgid "APT key management utility"
 msgstr "APT-Schlüsselverwaltungsdienstprogramm"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-key.8.xml:31
-msgid ""
-"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
-"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
-"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
-"arg>"
-msgstr ""
-"<command>apt-key</command> <arg><option>--keyring <replaceable>Dateiname</"
-"replaceable></option></arg> <arg><replaceable>Befehl</replaceable></arg> "
-"<arg rep=\"repeat\"><option><replaceable>Argumente</replaceable></option></"
-"arg>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:40
+#: apt-key.8.xml:32
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -4652,21 +4609,26 @@ msgstr ""
 "vertrauenswürdig betrachtet."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:46
+#: apt-key.8.xml:38
 msgid "Commands"
 msgstr "Befehle"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:48
-msgid "add <replaceable>filename</replaceable>"
-msgstr "add <replaceable>Dateiname</replaceable>"
+#: apt-key.8.xml:40
+msgid "add &synopsis-param-filename;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:44
+#, fuzzy
+#| msgid ""
+#| "Add a new key to the list of trusted keys.  The key is read from "
+#| "<replaceable>filename</replaceable>, or standard input if "
+#| "<replaceable>filename</replaceable> is <literal>-</literal>."
 msgid ""
-"Add a new key to the list of trusted keys.  The key is read from "
-"<replaceable>filename</replaceable>, or standard input if "
-"<replaceable>filename</replaceable> is <literal>-</literal>."
+"Add a new key to the list of trusted keys.  The key is read from &synopsis-"
+"param-filename;, or standard input if &synopsis-param-filename; is <literal>-"
+"</literal>."
 msgstr ""
 "Einen neuen Schlüssel zur Liste der vertrauenswürdigen Schlüssel hinzufügen. "
 "Der Schlüssel wird aus <replaceable>Dateiname</replaceable> gelesen oder, "
@@ -4674,65 +4636,67 @@ msgstr ""
 "Standardeingabe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:60
-msgid "del <replaceable>keyid</replaceable>"
-msgstr "del <replaceable>Schlüssel-ID</replaceable>"
+#: apt-key.8.xml:52
+msgid "del &synopsis-param-keyid;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:64
+#: apt-key.8.xml:56
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 "Einen Schlüssel von der Liste der vertrauenswürdigen Schlüssel entfernen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:71
-msgid "export <replaceable>keyid</replaceable>"
-msgstr "export <replaceable>Schlüssel-ID</replaceable>"
+#: apt-key.8.xml:63
+msgid "export &synopsis-param-keyid;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:75
-msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+#: apt-key.8.xml:67
+#, fuzzy
+#| msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr ""
 "Den Schlüssel <replaceable>Schlüssel-ID</replaceable> auf der "
 "Standardausgabe ausgeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:74
 msgid "exportall"
 msgstr "exportall"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:86
+#: apt-key.8.xml:78
 msgid "Output all trusted keys to standard output."
 msgstr "Alle vertrauenswürdigen Schlüssel auf der Standardausgabe ausgeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:85
 msgid "list"
 msgstr "list"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:97
+#: apt-key.8.xml:89
 msgid "List trusted keys."
 msgstr "Vertrauenswürdige Schlüssel auflisten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:96
 msgid "finger"
 msgstr "finger"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:108
+#: apt-key.8.xml:100
 msgid "List fingerprints of trusted keys."
 msgstr "Fingerabdrücke vertrauenswürdiger Schlüssel auflisten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:107
 msgid "adv"
 msgstr "adv"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:119
+#: apt-key.8.xml:111
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -4741,7 +4705,7 @@ msgstr ""
 "öffentlichen Schlüssel herunterladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:131
+#: apt-key.8.xml:123
 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 "
@@ -4751,17 +4715,25 @@ msgid ""
 msgstr ""
 "Aktualisiert den lokalen Schlüsselbund mit dem Archivschlüsselbund und "
 "entfernt die Archivschlüssel, die nicht länger gültig sind, aus dem lokalen "
-"Schlüsselbund. Der Archivschlüsselbund wird im Paket "
-"<literal>archive-keyring</literal> Ihrer Distribution mitgeliefert, z.B. dem "
-"Paket <literal>debian-archive-keyring</literal> in Debian."
+"Schlüsselbund. Der Archivschlüsselbund wird im Paket <literal>archive-"
+"keyring</literal> Ihrer Distribution mitgeliefert, z.B. dem Paket "
+"<literal>debian-archive-keyring</literal> in Debian."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:141
+#: apt-key.8.xml:133
 msgid "net-update"
 msgstr "net-update"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:137
+#, fuzzy
+#| msgid ""
+#| "Work similar to the <command>update</command> command above, but get the "
+#| "archive keyring from an URI instead and validate it against a master "
+#| "key.  This requires an installed &wget; and an APT build configured to "
+#| "have a server to fetch from and a master keyring to validate.  APT in "
+#| "Debian does not support this command and relies on <command>update</"
+#| "command> instead, but Ubuntu's APT does."
 msgid ""
 "Work similar to the <command>update</command> command above, but get the "
 "archive keyring from an URI instead and validate it against a master key.  "
@@ -4775,11 +4747,11 @@ msgstr ""
 "ihn anhand eines Master-Schlüssels. Dies erfordert ein installiertes &wget; "
 "und einen derart gebauten APT, bei dem ein Server konfiguriert ist, um den "
 "Master-Schlüsselbund zur Bestätigung abzuholen. APT unterstützt in Debian "
-"diesen Befehl nicht und beruht stattdessen auf <command>update</command>, "
-"in Ubuntu funktioniert dies aber."
+"diesen Befehl nicht und beruht stattdessen auf <command>update</command>, in "
+"Ubuntu funktioniert dies aber."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:154
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -4788,12 +4760,20 @@ msgstr ""
 "Befehlen definiert sein müssen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:164
-msgid "--keyring <replaceable>filename</replaceable>"
-msgstr "--keyring <replaceable>Dateiname</replaceable>"
+#: apt-key.8.xml:156
+msgid "--keyring &synopsis-param-filename;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:165
+#: apt-key.8.xml:157
+#, fuzzy
+#| msgid ""
+#| "With this option it is possible to specify a specific keyring file the "
+#| "command should operate on. The default is that a command is executed on "
+#| "the <filename>trusted.gpg</filename> file as well as on all parts in the "
+#| "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
+#| "gpg</filename> is the primary keyring which means that e.g. new keys are "
+#| "added to this one."
 msgid ""
 "With this option it is possible to specify a specific keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -4810,45 +4790,45 @@ msgstr ""
 "Schlüssel werden zu diesem hinzugefügt."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:178
+#: apt-key.8.xml:170
 msgid "&file-trustedgpg;"
 msgstr "&file-trustedgpg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:180
+#: apt-key.8.xml:172
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:173
 msgid "Local trust database of archive keys."
 msgstr "Lokale Datenbank vertrauenswürdiger Archivschlüssel."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:184
+#: apt-key.8.xml:176
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:177
 msgid "Keyring of Debian archive trusted keys."
 msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:188
+#: apt-key.8.xml:180
 msgid ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:181
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr ""
 "Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:198
+#: apt-key.8.xml:190
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
@@ -4874,27 +4854,8 @@ msgstr ""
 "ein Paket als automatisch installiert markieren oder diese Markierung "
 "entfernen"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-mark.8.xml:39
-msgid ""
-"  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
-"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
-"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> </group>"
-msgstr ""
-"  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-"<arg><option>-f=<replaceable>DATEINAME</replaceable></option></arg> <group "
-"choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-"choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
-"choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> "
-"</group> <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>Paket</replaceable></arg> </arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:39
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -4903,7 +4864,7 @@ msgstr ""
 "installiert markiert ist."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:61
+#: apt-mark.8.xml:43
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -4919,12 +4880,12 @@ msgstr ""
 "<command>aptitude</command> entfernt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:51
 msgid "auto"
 msgstr "auto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:52
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -4935,12 +4896,12 @@ msgstr ""
 "keine manuell installierten Pakete von ihm abhängen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:59
 msgid "manual"
 msgstr "manual"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:78
+#: apt-mark.8.xml:60
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -4951,12 +4912,12 @@ msgstr ""
 "kein anderes Paket von ihm abhängt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:67
 msgid "hold"
 msgstr "hold"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:68
 msgid ""
 "<literal>hold</literal> is used to mark a package as hold back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -4967,31 +4928,31 @@ msgstr ""
 "<literal>hold</literal> wird benutzt, um ein Paket als zurückgehalten zu "
 "markieren, was verhindert, dass das Paket automatisch installiert, ein "
 "Upgrade davon durchgeführt oder es entfernt wird. Der Befehl ist nur ein "
-"Wrapper um <command>dpkg --set-selections</command> und der Status wird daher "
-"durch &dpkg; verwaltet und nicht durch die Option "
-"<option>--filename</option>."
+"Wrapper um <command>dpkg --set-selections</command> und der Status wird "
+"daher durch &dpkg; verwaltet und nicht durch die Option <option>--filename</"
+"option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:95
+#: apt-mark.8.xml:77
 msgid "unhold"
 msgstr "unhold"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:78
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
 msgstr ""
-"<literal>unhold</literal> wird benutzt, um ein vorher gesetztes »hold« "
-"auf ein Paket aufzuheben, um alle Aktionen wieder zu erlauben."
+"<literal>unhold</literal> wird benutzt, um ein vorher gesetztes »hold« auf "
+"ein Paket aufzuheben, um alle Aktionen wieder zu erlauben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:83
 msgid "showauto"
 msgstr "showauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:102
+#: apt-mark.8.xml:84
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -5005,12 +4966,12 @@ msgstr ""
 "die automatisch installiert wurden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:109
+#: apt-mark.8.xml:91
 msgid "showmanual"
 msgstr "showmanual"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:110
+#: apt-mark.8.xml:92
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -5021,12 +4982,12 @@ msgstr ""
 "stattdessen eine Liste manuell installierter Pakete ausgibt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:116
+#: apt-mark.8.xml:98
 msgid "showhold"
 msgstr "showhold"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:99
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
@@ -5035,14 +4996,14 @@ msgstr ""
 "Pakete auf die gleiche Art wie für andere Anzeigebefehle auszugeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:130
+#: apt-mark.8.xml:112
 msgid ""
 "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
 "<option>-f=<filename><replaceable>DATEINAME</replaceable></filename></option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:131
+#: apt-mark.8.xml:113
 msgid ""
 "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
 "option>"
@@ -5051,7 +5012,7 @@ msgstr ""
 "option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:116
 msgid ""
 "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
 "filename> instead of the default location, which is "
@@ -5064,17 +5025,17 @@ msgstr ""
 "definierten Verzeichnis, ist."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:146
+#: apt-mark.8.xml:128
 msgid "  &file-extended_states;"
 msgstr "  &file-extended_states;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:151
+#: apt-mark.8.xml:133
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr "&apt-get;,&aptitude;,&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:155
+#: apt-mark.8.xml:137
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -5413,22 +5374,8 @@ msgstr "apt-sortpkgs"
 msgid "Utility to sort package index files"
 msgstr "Werkzeug zum Sortieren von Paketindexdateien"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-sortpkgs.1.xml:39
-msgid ""
-"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-msgstr ""
-"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-"<arg><option>-o=<replaceable>Konfigurationszeichenkette</replaceable></"
-"option></arg> <arg><option>-c=<replaceable>Datei</replaceable></option></"
-"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>Datei</replaceable></"
-"arg>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:48
+#: apt-sortpkgs.1.xml:39
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (Source index or "
 "Package index) and sort the records so that they are ordered by the package "
@@ -5440,19 +5387,19 @@ msgstr ""
 "die internen Felder jedes Datensatzes gemäß interner Sortierregeln sortieren."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:54
+#: apt-sortpkgs.1.xml:45
 msgid "All output is sent to stdout, the input must be a seekable file."
 msgstr ""
 "Alle Ausgaben werden an stdout gesendet, die Eingabe muss eine durchsuchbare "
 "Datei sein."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:61
+#: apt-sortpkgs.1.xml:52
 msgid "<option>--source</option>"
 msgstr "<option>--source</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:63
+#: apt-sortpkgs.1.xml:54
 msgid ""
 "Use Source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -5461,7 +5408,7 @@ msgstr ""
 "SortPkgs::Source</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:77
+#: apt-sortpkgs.1.xml:68
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -5480,8 +5427,8 @@ msgid ""
 msgstr ""
 "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
 "firstname> <surname>Burrows</surname> <contrib>Erste Dokumentation von "
-"Debug::*.</contrib> <email>dburrows@debian.org</email> "
-"</author> &apt-email; &apt-product; <date>16. Januar 2010</date>"
+"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
+"&apt-product; <date>16. Januar 2010</date>"
 
 #. type: Content of: <refentry><refnamediv><refname>
 #: apt.conf.5.xml:31 apt.conf.5.xml:38
@@ -5532,6 +5479,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml:52
+#, fuzzy
+#| msgid ""
+#| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+#| "order which have either no or \"<literal>conf</literal>\" as filename "
+#| "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+#| "and period (.) characters.  Otherwise APT will print a notice that it has "
+#| "ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+#| "Ignore-Files-Silently</literal> configuration list - in this case it will "
+#| "be silently ignored."
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -5542,13 +5498,13 @@ msgid ""
 "silently ignored."
 msgstr ""
 "alle Dateien in <literal>Dir::Etc::Parts</literal> in aufsteigender "
-"alphanumerischer Reihenfolge, die entweder keine oder "
-"»<literal>conf</literal>« als Dateinamenserweiterung haben und die nur "
-"alphanumerische Zeichen, Bindestriche (-), Unterstriche (_) und Punkte (.) "
-"enthalten. Andernfalls wird APT einen Hinweis ausgeben, dass es eine Datei "
-"ignoriert hat, falls die Datei nicht auf ein Muster in der "
-"Konfigurationsliste <literal>Dir::Ignore-Files-Silently</literal> passt – in "
-"diesem Fall wird sie stillschweigend ignoriert."
+"alphanumerischer Reihenfolge, die entweder keine oder »<literal>conf</"
+"literal>« als Dateinamenserweiterung haben und die nur alphanumerische "
+"Zeichen, Bindestriche (-), Unterstriche (_) und Punkte (.) enthalten. "
+"Andernfalls wird APT einen Hinweis ausgeben, dass es eine Datei ignoriert "
+"hat, falls die Datei nicht auf ein Muster in der Konfigurationsliste "
+"<literal>Dir::Ignore-Files-Silently</literal> passt – in diesem Fall wird "
+"sie stillschweigend ignoriert."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml:59
@@ -6108,6 +6064,15 @@ msgstr "Max-ValidTime"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:269
+#, fuzzy
+#| msgid ""
+#| "Minimum of seconds the Release file should be considered valid after it "
+#| "was created (indicated by the <literal>Date</literal> header).  Use this "
+#| "if you need to use a seldomly updated (local) mirror of a more regular "
+#| "updated archive with a <literal>Valid-Until</literal> header instead of "
+#| "completely disabling the expiration date checking.  Archive specific "
+#| "settings can and should be used by appending the label of the archive to "
+#| "the option name."
 msgid ""
 "Seconds the Release file should be considered valid after it was created "
 "(indicated by the <literal>Date</literal> header).  If the Release file "
@@ -6116,13 +6081,14 @@ msgid ""
 "literal> which stands for \"for ever\".  Archive specific settings can be "
 "made by appending the label of the archive to the option name."
 msgstr ""
-"Sekunden, die die Release-Datei als gültig betrachtet werden sollte, nachdem "
-"sie erzeugt wurde (angezeigt durch die Kopfzeile <literal>Date</literal>). "
-"Falls die Release-Datei selbst eine <literal>Valid-Until</literal>-Kopfzeile "
-"enhält, wird der frühere von beiden Terminen als Verfallsdatum benutzt. "
-"Vorgabewert ist <literal>0</literal>, was »für immer« bedeutet. "
-"Archivspezifische Einstellungen können durch Anhängen des Archivetiketts an "
-"die Option »name« vorgenommen werden."
+"Minimale Anzahl der Sekunden, die die Release-Datei als gültig betrachtet "
+"werden sollte, nachdem sie erzeugt wurde (angezeigt durch die Kopfzeile "
+"<literal>Date</literal>). Benutzen Sie dies, falls Sie einen selten "
+"aktualisierten (lokalen) Spiegel eines regelmäßiger aktualisierten Archivs "
+"mit einer <literal>Valid-Until</literal>-Kopfzeile haben, anstatt die "
+"Überprüfung des Ablaufdatum komplett zu deaktivieren. Archivspezifische "
+"Einstellungen können und sollten durch Anhängen des Archivetiketts an die "
+"Option »name« vorgenommen werden."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: apt.conf.5.xml:279
@@ -6165,6 +6131,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:294
+#, fuzzy
+#| msgid ""
+#| "Two sub-options to limit the use of PDiffs are also available: With "
+#| "<literal>FileLimit</literal> can be specified how many PDiff files are "
+#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+#| "other hand is the maximum percentage of the size of all patches compared "
+#| "to the size of the targeted file. If one of these limits is exceeded the "
+#| "complete file is downloaded instead of the patches."
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: With "
 "<literal>FileLimit</literal> can be specified how many PDiff files are "
@@ -6232,7 +6206,7 @@ msgstr ""
 "kopiert zu werden. True ist die Vorgabe."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:321 sources.list.5.xml:155
+#: apt.conf.5.xml:321 sources.list.5.xml:160
 msgid "http"
 msgstr "http"
 
@@ -6399,7 +6373,7 @@ msgstr ""
 "SslForceVersion</literal> ist die entsprechende per-Host-Option."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:387 sources.list.5.xml:166
+#: apt.conf.5.xml:387 sources.list.5.xml:171
 msgid "ftp"
 msgstr "ftp"
 
@@ -6486,7 +6460,7 @@ msgstr ""
 "Server RFC2428 unterstützen."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426 sources.list.5.xml:148
+#: apt.conf.5.xml:426 sources.list.5.xml:153
 msgid "cdrom"
 msgstr "cdrom"
 
@@ -6616,6 +6590,18 @@ msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:459
+#, fuzzy
+#| msgid ""
+#| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
+#| "replaceable></literal> will be checked: If this setting exists the method "
+#| "will only be used if this file exists, e.g. for the bzip2 method (the "
+#| "inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+#| "also that list entries specified on the command line will be added at the "
+#| "end of the list specified in the configuration files, but before the "
+#| "default entries. To prefer a type in this case over the ones specified in "
+#| "the configuration files you can set the option direct - not in list "
+#| "style.  This will not override the defined list, it will only prefix the "
+#| "list with this type."
 msgid ""
 "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
 "replaceable></literal> will be checked: If this setting exists the method "
@@ -6642,6 +6628,12 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:466
+#, fuzzy
+#| msgid ""
+#| "The special type <literal>uncompressed</literal> can be used to give "
+#| "uncompressed files a preference, but note that most archives don't "
+#| "provide uncompressed files so this is mostly only useable for local "
+#| "mirrors."
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -7929,6 +7921,16 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt_preferences.5.xml:70
+#, fuzzy
+#| msgid ""
+#| "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+#| "directory are parsed in alphanumeric ascending order and need to obey the "
+#| "following naming convention: The files have either no or \"<literal>pref</"
+#| "literal>\" as filename extension and only contain alphanumeric, hyphen "
+#| "(-), underscore (_) and period (.) characters.  Otherwise APT will print "
+#| "a notice that it has ignored a file if the file doesn't match a pattern "
+#| "in the <literal>Dir::Ignore-Files-Silently</literal> configuration list - "
+#| "in this case it will be silently ignored."
 msgid ""
 "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
 "directory are parsed in alphanumeric ascending order and need to obey the "
@@ -8390,6 +8392,13 @@ msgstr "Reguläre Ausdrücke und glob()-Syntax"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:264
+#, fuzzy
+#| msgid ""
+#| "APT also supports pinning by glob() expressions and regular expressions "
+#| "surrounded by /. For example, the following example assigns the priority "
+#| "500 to all packages from experimental where the name starts with gnome "
+#| "(as a glob()-like expression) or contains the word kde (as a POSIX "
+#| "extended regular expression surrounded by slashes)."
 msgid ""
 "APT also supports pinning by glob() expressions and regular expressions "
 "surrounded by /. For example, the following example assigns the priority 500 "
@@ -8418,6 +8427,11 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:279
+#, fuzzy
+#| msgid ""
+#| "The rule for those expressions is that they can occur anywhere where a "
+#| "string can occur. Thus, the following pin assigns the priority 990 to all "
+#| "packages from a release starting with karmic."
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -8694,11 +8708,11 @@ msgstr ""
 "Die <filename>Packages</filename>-Datei wird normalerweise im Verzeichnis "
 "<filename>…/dists/<replaceable>Distributions-Name</replaceable>/"
 "<replaceable>Komponente</replaceable>/<replaceable>Architektur</"
-"replaceable></filename> gefunden, zum Beispiel <filename>…/dists/stable/"
-"main/binary-i386/Packages</filename>. Sie besteht aus einer Serie "
-"mehrzeiliger Datensätze, einem für jedes verfügbare Paket in diesem "
-"Verzeichnis. In jedem Datensatz sind nur zwei Zeilen zum Setzen der APT-"
-"Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
+"replaceable></filename> gefunden, zum Beispiel <filename>…/dists/stable/main/"
+"binary-i386/Packages</filename>. Sie besteht aus einer Serie mehrzeiliger "
+"Datensätze, einem für jedes verfügbare Paket in diesem Verzeichnis. In jedem "
+"Datensatz sind nur zwei Zeilen zum Setzen der APT-Prioritäten relevant: "
+"<placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:427
@@ -8874,8 +8888,8 @@ msgid ""
 "\"0\"/>"
 msgstr ""
 "Die <filename>Release</filename>-Datei ist normalerweise im Verzeichnis "
-"<filename>…/dists/<replaceable>Distributionsname</replaceable></filename> "
-"zu finden, zum Beispiel <filename>…/dists/stable/Release</filename> oder "
+"<filename>…/dists/<replaceable>Distributionsname</replaceable></filename> zu "
+"finden, zum Beispiel <filename>…/dists/stable/Release</filename> oder "
 "<filename>…/dists/&stable-codename;/Release</filename>. Sie besteht aus "
 "einem einzelnen mehrzeiligen Datensatz, der auf <emphasis>alle</emphasis> "
 "Pakete im Verzeichnisbaum unterhalb des übergeordneten Verzeichnisses "
@@ -9334,6 +9348,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:81
+#, fuzzy, no-wrap
+#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 msgid "deb [ options ] uri distribution [component1] [component2] [...]"
 msgstr "deb [ Optionen ] URI Distribution [Komponente1] [Komponente2] […]"
 
@@ -9415,10 +9431,10 @@ msgid ""
 msgstr ""
 "<literal>options</literal> ist immer optional und muss in eckige Klammern "
 "eingeschlossen werden. Es kann aus mehreren Einstellungen in der Form "
-"<literal><replaceable>Einstellung</replaceable>=<replaceable>Wert"
-"</replaceable></literal> bestehen. Mehrere Einstellungen werden durch "
-"Leerzeichen getrennt. Die folgenden Einstellungen werden von APT unterstützt. "
-"Beachten Sie allerdings, dass nicht unterstützte Einstellungen "
+"<literal><replaceable>Einstellung</replaceable>=<replaceable>Wert</"
+"replaceable></literal> bestehen. Mehrere Einstellungen werden durch "
+"Leerzeichen getrennt. Die folgenden Einstellungen werden von APT "
+"unterstützt. Beachten Sie allerdings, dass nicht unterstützte Einstellungen "
 "stillschweigend ignoriert werden."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -9430,15 +9446,26 @@ msgid ""
 "architectures defined by the <literal>APT::Architectures</literal> option "
 "will be downloaded."
 msgstr ""
-"<literal>arch=<replaceable>Architektur1</replaceable>,<replaceable>"
-"Architektur2</replaceable>, …</literal> kann benutzt werden, um anzugeben, "
-"für welche Architekturen Paketinformationen heruntergeladen werden sollen. "
-"Falls diese Option nicht gesetzt ist, werden alle durch die Option "
-"<literal>APT::Architectures</literal> definierten Architekturen "
+"<literal>arch=<replaceable>Architektur1</replaceable>,"
+"<replaceable>Architektur2</replaceable>, …</literal> kann benutzt werden, um "
+"anzugeben, für welche Architekturen Paketinformationen heruntergeladen "
+"werden sollen. Falls diese Option nicht gesetzt ist, werden alle durch die "
+"Option <literal>APT::Architectures</literal> definierten Architekturen "
 "heruntergeladen."
 
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:121
+msgid ""
+"<literal>trusted=yes</literal> can be set to indicate that packages from "
+"this source are always authenificated even if the <filename>Release</"
+"filename> file is not signed or the signature can't be checked. This "
+"disables parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context. <literal>trusted=no</literal> is the opposite which "
+"handles even correctly authenificated sources as not authenificated."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:123
+#: sources.list.5.xml:128
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -9452,12 +9479,12 @@ msgstr ""
 "Rechnern, zum Beispiel)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:128
+#: sources.list.5.xml:133
 msgid "Some examples:"
 msgstr "Einige Beispiele:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:135
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -9469,17 +9496,17 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:141
 msgid "URI specification"
 msgstr "URI-Beschreibung"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:146
 msgid "file"
 msgstr "file"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:143
+#: sources.list.5.xml:148
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -9490,7 +9517,7 @@ msgstr ""
 "lokale Spiegel oder Archive."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:150
+#: sources.list.5.xml:155
 msgid ""
 "The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -9500,7 +9527,7 @@ msgstr ""
 "der Quellenliste zu erstellen."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:157
+#: sources.list.5.xml:162
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -9517,7 +9544,7 @@ msgstr ""
 "Beachten Sie, dass dies eine unsichere Authentifizierungsmethode ist."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:173
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
@@ -9537,12 +9564,12 @@ msgstr ""
 "Konfigurationsdatei HTTP benutzen, werden ignoriert."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:177
+#: sources.list.5.xml:182
 msgid "copy"
 msgstr "copy"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:179
+#: sources.list.5.xml:184
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -9554,17 +9581,17 @@ msgstr ""
 "Platte benutzen, um Dateien mit APT umherzukopieren."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
 msgid "rsh"
 msgstr "rsh"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
 msgid "ssh"
 msgstr "ssh"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:186
+#: sources.list.5.xml:191
 msgid ""
 "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
 "user and access the files. It is a good idea to do prior arrangements with "
@@ -9580,12 +9607,12 @@ msgstr ""
 "aus der Ferne durchzuführen."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:199
 msgid "more recognizable URI types"
 msgstr "weitere erkennbare URI-Typen"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:196
+#: sources.list.5.xml:201
 msgid ""
 "APT can be extended with more methods shipped in other optional packages "
 "which should follow the nameing scheme <literal>apt-transport-"
@@ -9607,7 +9634,7 @@ msgstr ""
 "citerefentry>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:138
+#: sources.list.5.xml:143
 msgid ""
 "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
 "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -9616,7 +9643,7 @@ msgstr ""
 "»ssh«, »rsh«. <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:215
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -9625,37 +9652,37 @@ msgstr ""
 "jason/debian für stable/main, stable/contrib und stable/non-free."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:217
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:214
+#: sources.list.5.xml:219
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "Wie oben, außer das dies die »unstable«- (Entwicklungs-) Distribution "
 "benutzt."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:220
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:222
 msgid "Source line for the above"
 msgstr "Quellzeile für obiges"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:223
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:225
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -9666,7 +9693,7 @@ msgstr ""
 "<literal>amd64</literal> und <literal>armel</literal> holt."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:227
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -9676,7 +9703,7 @@ msgstr ""
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:230
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -9685,13 +9712,13 @@ msgstr ""
 "den hamm/main-Bereich zu benutzen."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
+#: sources.list.5.xml:232
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:229
+#: sources.list.5.xml:234
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -9701,13 +9728,13 @@ msgstr ""
 "benutzen."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:231
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:238
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -9721,19 +9748,19 @@ msgstr ""
 "für beide Quellzeilen benutzt."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:246
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:244
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -9753,7 +9780,7 @@ msgstr ""
 "type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:256
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
@@ -11309,3 +11336,295 @@ msgstr "  # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade"
 #: offline.sgml:234
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
+
+#~ msgid ""
+#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
+#~ "arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> "
+#~ "<arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</"
+#~ "replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>depends <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~ "<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~ "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
+#~ "\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~ "<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
+#~ "group>"
+#~ msgstr ""
+#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
+#~ "<arg><option>-o=<replaceable>Konfigurationszeichenkette</replaceable></"
+#~ "option></arg> <arg><option>-c=<replaceable>Datei</replaceable></option></"
+#~ "arg> <group choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
+#~ "<arg>showsrc <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</"
+#~ "replaceable></arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</"
+#~ "arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
+#~ "\"><replaceable>regulärer_Ausdruck</replaceable></arg></arg> <arg>show "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></"
+#~ "arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>Paket</replaceable></arg></arg> <arg>rdepends <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
+#~ "<arg>pkgnames <arg choice=\"plain\"><replaceable>Präfix</replaceable></"
+#~ "arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>Paket</replaceable></arg></arg> <arg>xvcg <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
+#~ "<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>Pakete</"
+#~ "replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>Pakete</replaceable></arg></arg> </group>"
+
+#~ msgid ""
+#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
+#~ "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></"
+#~ "arg> <arg><option>-o=<replaceable>config string</replaceable></option></"
+#~ "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> "
+#~ "<group> <arg>add</arg> <arg>ident</arg> </group>"
+#~ msgstr ""
+#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
+#~ "<arg><option>-d=<replaceable>CD-ROM-Einhängepunkt</replaceable></option></"
+#~ "arg><arg><option>-o=<replaceable>Konfigurationszeichenkette</"
+#~ "replaceable></option></arg><arg><option>-c=<replaceable>Datei</"
+#~ "replaceable></option></arg><group><arg>hinzufügen</"
+#~ "arg><arg>Identifikation</arg></group>"
+
+#~ msgid ""
+#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
+#~ msgstr ""
+#~ "<command>apt-config</command><arg><option>-hv</option></arg><arg><option>-"
+#~ "o=<replaceable>Konfigurationszeichenkette</replaceable></option></"
+#~ "arg><arg><option>-c=<replaceable>Datei</replaceable></option></arg><group "
+#~ "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
+
+#~ msgid ""
+#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
+#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
+#~ "replaceable></arg>"
+#~ msgstr ""
+#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-t=<replaceable>temporäres Verzeichnis</replaceable></"
+#~ "option></arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>Datei</"
+#~ "replaceable></arg>"
+
+#~ msgid ""
+#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
+#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
+#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+#~ "arg> <arg><option>--arch <replaceable>architecture</replaceable></"
+#~ "option></arg> <arg><option>-o <replaceable>config</"
+#~ "replaceable>=<replaceable>string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
+#~ "replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#~ "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
+#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
+#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
+#~ "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
+#~ "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
+#~ "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
+#~ "group>"
+#~ msgstr ""
+#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
+#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
+#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+#~ "arg> <arg><option>--arch <replaceable>Architektur</replaceable></option></"
+#~ "arg> <arg><option>-o <replaceable>Konfiguration</"
+#~ "replaceable>=<replaceable>Zeichenkette</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>Datei</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>Pfad</replaceable></arg><arg><replaceable>überschreiben</"
+#~ "replaceable><arg><replaceable>Pfad-Präfix</replaceable></arg></arg></arg> "
+#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>Pfad</"
+#~ "replaceable></arg><arg><replaceable>überschreiben</"
+#~ "replaceable><arg><replaceable>Pfad-Präfix</replaceable></arg></arg></arg> "
+#~ "<arg>contents <arg choice=\"plain\"><replaceable>Pfad</replaceable></"
+#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>Pfad</"
+#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
+#~ "\"><replaceable>Konfigurationsdatei</replaceable></arg> <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>Abschnitt</replaceable></arg></arg> "
+#~ "<arg>clean <arg choice=\"plain\"><replaceable>Konfigurationsdatei</"
+#~ "replaceable></arg></arg> </group>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#~| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
+#~| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </"
+#~| "arg> <arg> <option>-t=</option> <arg choice='plain'> "
+#~| "<replaceable>target_release</replaceable> </arg> </arg> <arg> <option>-"
+#~| "a=</option> <arg choice='plain'> <replaceable>default_architecture</"
+#~| "replaceable> </arg> </arg> <group choice=\"req\"> <arg "
+#~| "choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
+#~| "choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
+#~| "arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
+#~| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
+#~| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#~| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice="
+#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
+#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> "
+#~| "<arg> <group choice='req'> <arg choice='plain'> "
+#~| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+#~| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#~| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#~| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#~| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#~| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#~| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#~| "help</arg> </group> </arg> </group>"
+#~ msgid ""
+#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#~ "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
+#~ "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
+#~ "<arg> <option>-t=</option> <arg choice='plain'> "
+#~ "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
+#~ "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
+#~ "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
+#~ "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
+#~ "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
+#~ "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
+#~ "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#~ "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
+#~ "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
+#~ "<group choice='req'> <arg choice='plain'> "
+#~ "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+#~ "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~ "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#~ "help</arg> </group> </arg> </group>"
+#~ msgstr ""
+#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#~ "<option>-o= <replaceable>Konfigurationszeichenkette</replaceable> </"
+#~ "option> </arg> <arg> <option>-c= <replaceable>Konfigurationsdatei</"
+#~ "replaceable> </option> </arg> <arg> <option>-t=</option> <arg "
+#~ "choice='plain'> <replaceable>Ziel-Release</replaceable> </arg> </arg> "
+#~ "<arg> <option>-a=</option> <arg choice='plain'> "
+#~ "<replaceable>Vorgabearchitektur</replaceable> </arg> </arg> <group choice="
+#~ "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
+#~ "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
+#~ "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
+#~ "\"repeat\"><replaceable>Paket</replaceable> <arg> <group choice='req'> "
+#~ "<arg choice='plain'> =<replaceable>Paket-Versionsnummer</replaceable> </"
+#~ "arg> <arg choice='plain'> /<replaceable>Ziel-Release</replaceable> </arg> "
+#~ "</group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
+#~ "<arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>Paket</replaceable></arg></arg> <arg "
+#~ "choice='plain'>source <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>Paket</replaceable> <arg> <group choice='req'> <arg "
+#~ "choice='plain'> =<replaceable>Paket-Versionsnummer</replaceable> </arg> "
+#~ "<arg choice='plain'> /<replaceable>Ziel-Release</replaceable> </arg> </"
+#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
+#~ "<arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#~ "help</arg> </group> </arg> </group>"
+
+#~ msgid ""
+#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+#~ "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
+#~ "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
+#~ "option></arg>"
+#~ msgstr ""
+#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>Dateiname</"
+#~ "replaceable></option></arg> <arg><replaceable>Befehl</replaceable></arg> "
+#~ "<arg rep=\"repeat\"><option><replaceable>Argumente</replaceable></"
+#~ "option></arg>"
+
+#~ msgid "add <replaceable>filename</replaceable>"
+#~ msgstr "add <replaceable>Dateiname</replaceable>"
+
+#~ msgid "del <replaceable>keyid</replaceable>"
+#~ msgstr "del <replaceable>Schlüssel-ID</replaceable>"
+
+#~ msgid "export <replaceable>keyid</replaceable>"
+#~ msgstr "export <replaceable>Schlüssel-ID</replaceable>"
+
+#~ msgid "--keyring <replaceable>filename</replaceable>"
+#~ msgstr "--keyring <replaceable>Dateiname</replaceable>"
+
+#~ msgid ""
+#~ "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
+#~ "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
+#~ "choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
+#~ "choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </"
+#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#~ "replaceable></arg> </arg> </group>"
+#~ msgstr ""
+#~ "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-f=<replaceable>DATEINAME</replaceable></option></arg> "
+#~ "<group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> "
+#~ "<arg choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
+#~ "choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </"
+#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</"
+#~ "replaceable></arg> </arg> </group>"
+
+#~ msgid ""
+#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
+#~ msgstr ""
+#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
+#~ "<arg><option>-o=<replaceable>Konfigurationszeichenkette</replaceable></"
+#~ "option></arg> <arg><option>-c=<replaceable>Datei</replaceable></option></"
+#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>Datei</"
+#~ "replaceable></arg>"
+
+#, fuzzy
+#~| msgid ""
+#~| "Seconds the Release file should be considered valid after it was created "
+#~| "(indicated by the <literal>Date</literal> header).  If the Release file "
+#~| "itself includes a <literal>Valid-Until</literal> header the earlier date "
+#~| "of the two is used as the expiration date.  The default value is "
+#~| "<literal>0</literal> which stands for \"for ever\".  Archive specific "
+#~| "settings can be made by appending the label of the archive to the option "
+#~| "name."
+#~ msgid ""
+#~ "Seconds the Release file should be considered valid after it was created. "
+#~ "The default is \"for ever\" (0) if the Release file of the archive "
+#~ "doesn't include a <literal>Valid-Until</literal> header.  If it does then "
+#~ "this date is the default. The date from the Release file or the date "
+#~ "specified by the creation time of the Release file (<literal>Date</"
+#~ "literal> header) plus the seconds specified with this options are used to "
+#~ "check if the validation of a file has expired by using the earlier date "
+#~ "of the two. Archive specific settings can be made by appending the label "
+#~ "of the archive to the option name."
+#~ msgstr ""
+#~ "Sekunden, die die Release-Datei als gültig betrachtet werden sollte, "
+#~ "nachdem sie erzeugt wurde (angezeigt durch die Kopfzeile <literal>Date</"
+#~ "literal>). Falls die Release-Datei selbst eine <literal>Valid-Until</"
+#~ "literal>-Kopfzeile enhält, wird der frühere von beiden Terminen als "
+#~ "Verfallsdatum benutzt. Vorgabewert ist <literal>0</literal>, was »für "
+#~ "immer« bedeutet. Archivspezifische Einstellungen können durch Anhängen "
+#~ "des Archivetiketts an die Option »name« vorgenommen werden."
diff --git a/doc/po/es.po b/doc/po/es.po
index f0f5b852a..ad840a57b 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -36,7 +36,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25\n"
-"POT-Creation-Date: 2011-11-20 17:58+0100\n"
+"POT-Creation-Date: 2012-04-11 17:54+0300\n"
 "PO-Revision-Date: 2010-08-25 03:25+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -675,7 +675,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:210
+#: apt.ent:211
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -700,6 +700,101 @@ msgstr ""
 "     la traducción no está actualizada con respecto al documento original.\n"
 "\">\n"
 
+#. type: Plain text
+#: apt.ent:214
+msgid ""
+"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
+"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:217
+msgid ""
+"<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+"synopsis-config-file \"config_file\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:220
+msgid ""
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
+"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"\"target_release\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:223
+msgid ""
+"<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+"synopsis-architecture \"architecture\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:226
+msgid ""
+"<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+"--> <!ENTITY synopsis-pkg \"pkg\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:229
+msgid ""
+"<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
+"ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:232
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+"pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:235
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+"awesome --> <!ENTITY synopsis-regex \"regex\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:238
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
+"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:241
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
+"apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+"\"temporary_directory\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:244
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+"synopsis-filename \"filename\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:250
+msgid ""
+"<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive "
+"packages path override pathprefix --> <!ENTITY synopsis-path \"path\"> <!"
+"ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section "
+"\"section\"> <!ENTITY synopsis-override \"override\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:253
+msgid ""
+"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+msgstr ""
+
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:16
@@ -739,85 +834,17 @@ msgstr "APT"
 msgid "query the APT cache"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cache.8.xml:39
-#, fuzzy
-#| msgid ""
-#| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
-#| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
-#| "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
-#| "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice="
-#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#| "<arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice="
-#| "\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#| "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
-#| "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
-#| "group>"
-msgid ""
-"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
-"<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
-"arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></arg></"
-"arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>policy <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></"
-"arg> </group>"
-msgstr ""
-"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
-"o=<replaceable>cadena-de-configuración</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>fichero</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>fichero</replaceable></arg></arg> <arg>gencaches</arg> "
-"<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquete</"
-"replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>paquete</replaceable></arg></arg> <arg>stats</arg> "
-"<arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg "
-"choice=\"plain\"><replaceable>exp_regular</replaceable></arg></arg> "
-"<arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable></replaceable></"
-"arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>paquete</replaceable></arg></arg> <arg>rdepends <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable></arg></arg> "
-"<arg>pkgnames <arg choice=\"plain\"><replaceable>prefijo</replaceable></"
-"arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>paquete</replaceable></arg></arg> <arg>xvcg <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable></arg></arg> "
-"<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquetes</"
-"replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>paquetes</replaceable></arg></arg> </group>"
-
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
-#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121
-#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
-#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
+#: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38
+#: apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38
+#: apt-key.8.xml:30 apt-mark.8.xml:38 apt-secure.8.xml:43
+#: apt-sortpkgs.1.xml:38 apt.conf.5.xml:42 apt_preferences.5.xml:36
 #: sources.list.5.xml:36
 msgid "Description"
 msgstr "Descripción"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:65
+#: apt-cache.8.xml:39
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -830,7 +857,7 @@ msgstr ""
 "genera información interesante a partir de los metadatos del paquete."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:70 apt-get.8.xml:127
+#: apt-cache.8.xml:44 apt-get.8.xml:44
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -839,12 +866,12 @@ msgstr ""
 "una de las siguientes órdenes debe estar presente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:74
+#: apt-cache.8.xml:48
 msgid "gencaches"
 msgstr "gencaches"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:75
+#: apt-cache.8.xml:49
 msgid ""
 "<literal>gencaches</literal> performs the same operation as <command>apt-get "
 "check</command>. It builds the source and package caches from the sources in "
@@ -856,12 +883,12 @@ msgstr ""
 "<filename>/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:81
+#: apt-cache.8.xml:55
 msgid "showpkg <replaceable>pkg(s)</replaceable>"
 msgstr "showpkg <replaceable>paquete(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:82
+#: apt-cache.8.xml:56
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -885,7 +912,7 @@ msgstr ""
 "siguiente:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:94
+#: apt-cache.8.xml:68
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -911,7 +938,7 @@ msgstr ""
 "Reverse Provides: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:106
+#: apt-cache.8.xml:80
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -930,12 +957,12 @@ msgstr ""
 "salida lo mejor es consultar el código fuente de apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:89
 msgid "stats"
 msgstr "stats"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:89
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -944,7 +971,7 @@ msgstr ""
 "necesita ningún argumento adicional. Las estadísticas que muestra son:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:118
+#: apt-cache.8.xml:92
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -953,7 +980,7 @@ msgstr ""
 "encontrados en la caché."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:122
+#: apt-cache.8.xml:96
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -966,7 +993,7 @@ msgstr ""
 "dependencias. La mayoría de los paquetes pertenecen a este grupo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:128
+#: apt-cache.8.xml:102
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -984,7 +1011,7 @@ msgstr ""
 "agent»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:136
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -997,7 +1024,7 @@ msgstr ""
 "pero sólo un paquete, xless, proporciona «X11-text-viewer»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:142
+#: apt-cache.8.xml:116
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -1011,7 +1038,7 @@ msgstr ""
 "paquete debconf-tiny."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:149
+#: apt-cache.8.xml:123
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -1027,7 +1054,7 @@ msgstr ""
 "«Conflicts» o «Breaks» de la descripción de los paquetes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:130
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache; this value is therefore at least equal to the number of "
@@ -1042,7 +1069,7 @@ msgstr ""
 "valor puede ser considerablemente mayor que el número total de paquetes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:163
+#: apt-cache.8.xml:137
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -1051,12 +1078,12 @@ msgstr ""
 "dependencia de todos los paquetes de la caché."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:170
+#: apt-cache.8.xml:144
 msgid "showsrc <replaceable>pkg(s)</replaceable>"
 msgstr "showsrc <replaceable>paquete(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -1068,12 +1095,12 @@ msgstr ""
 "son binarios."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:176 apt-config.8.xml:87
+#: apt-cache.8.xml:150 apt-config.8.xml:75
 msgid "dump"
 msgstr "dump"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:151
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -1082,12 +1109,12 @@ msgstr ""
 "la caché. Fundamentalmente para depuración."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:181
+#: apt-cache.8.xml:155
 msgid "dumpavail"
 msgstr "dumpavail"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:156
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
@@ -1097,12 +1124,12 @@ msgstr ""
 "además, la usa el método &dselect;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:186
+#: apt-cache.8.xml:160
 msgid "unmet"
 msgstr "unmet"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:161
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -1111,12 +1138,12 @@ msgstr ""
 "satisfechas en la caché de paquetes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml:165
 msgid "show <replaceable>pkg(s)</replaceable>"
 msgstr "show <replaceable>paquete(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -1125,12 +1152,12 @@ msgstr ""
 "avail</command>, muestra los campos del paquete para los paquetes nombrados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:171
 msgid "search <replaceable>regex [ regex ... ]</replaceable>"
 msgstr "search <replaceable>exp-regular [exp-regular ...]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:172
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see "
@@ -1155,7 +1182,7 @@ msgstr ""
 "sólo se busca en el nombre de los paquetes, no en la descripción larga."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:211
+#: apt-cache.8.xml:185
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -1164,12 +1191,12 @@ msgstr ""
 "búsqueda que se juntarán mediante una «Y lógica»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:215
+#: apt-cache.8.xml:189
 msgid "depends <replaceable>pkg(s)</replaceable>"
 msgstr "depends <replaceable>paquete(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:216
+#: apt-cache.8.xml:190
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -1178,12 +1205,12 @@ msgstr ""
 "paquete y de todos los demás paquetes que la pueden satisfacer."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:220
+#: apt-cache.8.xml:194
 msgid "rdepends <replaceable>pkg(s)</replaceable>"
 msgstr "rdepends <replaceable>paquete(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:195
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -1191,12 +1218,12 @@ msgstr ""
 "<literal>rdepends</literal> muestra las dependencias inversas de un paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:225
+#: apt-cache.8.xml:199
 msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
 msgstr "pkgnames <replaceable>[ prefijo ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml:200
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -1212,7 +1239,7 @@ msgstr ""
 "generate</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:205
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -1223,12 +1250,12 @@ msgstr ""
 "virtuales también aparecen en la lista generada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:236
+#: apt-cache.8.xml:210
 msgid "dotty <replaceable>pkg(s)</replaceable>"
 msgstr "dotty <replaceable>paquete(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:237
+#: apt-cache.8.xml:211
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1249,7 +1276,7 @@ msgstr ""
 "active la opción <literal>APT::Cache::GivenOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:246
+#: apt-cache.8.xml:220
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -1264,17 +1291,17 @@ msgstr ""
 "líneas verdes son conflictos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:251
+#: apt-cache.8.xml:225
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr "Tenga cuidado, dotty no puede dibujar grandes conjuntos de paquetes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
+#: apt-cache.8.xml:228
 msgid "xvcg <replaceable>pkg(s)</replaceable>"
 msgstr "xvcg <replaceable>paquete(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:229
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -1284,12 +1311,12 @@ msgstr ""
 "ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:259
+#: apt-cache.8.xml:233
 msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
 msgstr "policy <replaceable>[ paquete(s) ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:260
+#: apt-cache.8.xml:234
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -1302,12 +1329,12 @@ msgstr ""
 "detallada acerca de la prioridad de selección del paquete nombrado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:266
+#: apt-cache.8.xml:240
 msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
 msgstr "madison <replaceable>[ paquete(s) ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:267
+#: apt-cache.8.xml:241
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -1326,24 +1353,24 @@ msgstr ""
 "paquetes (<literal>APT::Architecture</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126
-#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
+#: apt-cache.8.xml:252 apt-config.8.xml:84 apt-extracttemplates.1.xml:51
+#: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
+#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:577 apt.conf.5.xml:599
 msgid "options"
 msgstr "Opciones"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:256
 msgid "<option>-p</option>"
 msgstr "<option>-p</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:256
 msgid "<option>--pkg-cache</option>"
 msgstr "<option>--pkg-cache</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:283
+#: apt-cache.8.xml:257
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -1354,18 +1381,18 @@ msgstr ""
 "configuración: <literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404
-#: apt-sortpkgs.1.xml:61
+#: apt-cache.8.xml:262 apt-ftparchive.1.xml:551 apt-get.8.xml:321
+#: apt-sortpkgs.1.xml:52
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
+#: apt-cache.8.xml:262
 msgid "<option>--src-cache</option>"
 msgstr "<option>--src-cache</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:263
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1380,17 +1407,17 @@ msgstr ""
 "Opción de configuración: <literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
+#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
+#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:271
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1404,17 +1431,17 @@ msgstr ""
 "configuración: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:277
 msgid "<option>-i</option>"
 msgstr "<option>-i</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:277
 msgid "<option>--important</option>"
 msgstr "<option>--important</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:304
+#: apt-cache.8.xml:278
 msgid ""
 "Print only important dependencies; for use with unmet and depends. Causes "
 "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
@@ -1425,47 +1452,47 @@ msgstr ""
 "configuración: <literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
+#: apt-cache.8.xml:283
 msgid "<option>--no-pre-depends</option>"
 msgstr "<option>--no-pre-depends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:284
 msgid "<option>--no-depends</option>"
 msgstr "<option>--no-depends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:285
 msgid "<option>--no-recommends</option>"
 msgstr "<option>--no-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:286
 msgid "<option>--no-suggests</option>"
 msgstr "<option>--no-suggests</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:287
 msgid "<option>--no-conflicts</option>"
 msgstr "<option>--no-conflicts</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:314
+#: apt-cache.8.xml:288
 msgid "<option>--no-breaks</option>"
 msgstr "<option>--no-breaks</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315
+#: apt-cache.8.xml:289
 msgid "<option>--no-replaces</option>"
 msgstr "<option>--no-replaces</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:290
 msgid "<option>--no-enhances</option>"
 msgstr "<option>--no-enhances</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:291
 #, fuzzy
 #| msgid ""
 #| "Per default the <literal>depends</literal> and <literal>rdepends</"
@@ -1488,17 +1515,17 @@ msgstr ""
 "<literal>APT::Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
+#: apt-cache.8.xml:297 apt-cdrom.8.xml:111 apt-get.8.xml:278
 msgid "<option>-f</option>"
 msgstr "<option>-f</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323
+#: apt-cache.8.xml:297
 msgid "<option>--full</option>"
 msgstr "<option>--full</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:324
+#: apt-cache.8.xml:298
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -1507,18 +1534,18 @@ msgstr ""
 "Opción de configuración: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
-#: apt-get.8.xml:447
+#: apt-cache.8.xml:302 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563
+#: apt-get.8.xml:369
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:302
 msgid "<option>--all-versions</option>"
 msgstr "<option>--all-versions</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:303
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -1535,17 +1562,17 @@ msgstr ""
 "configuración: <literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:311
 msgid "<option>-g</option>"
 msgstr "<option>-g</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:311
 msgid "<option>--generate</option>"
 msgstr "<option>--generate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:312
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1557,17 +1584,17 @@ msgstr ""
 "Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:317
 msgid "<option>--names-only</option>"
 msgstr "<option>--names-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343 apt-cdrom.8.xml:142
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:129
 msgid "<option>-n</option>"
 msgstr "<option>-n</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:318
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1576,12 +1603,12 @@ msgstr ""
 "Opción de configuración: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:348
+#: apt-cache.8.xml:322
 msgid "<option>--all-names</option>"
 msgstr "<option>--all-names</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:323
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -1592,12 +1619,12 @@ msgstr ""
 "configuración: <literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:354
+#: apt-cache.8.xml:328
 msgid "<option>--recurse</option>"
 msgstr "<option>--recurse</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:355
+#: apt-cache.8.xml:329
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1608,12 +1635,12 @@ msgstr ""
 "vez. Opción de configuración <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:360
+#: apt-cache.8.xml:334
 msgid "<option>--installed</option>"
 msgstr "<option>--installed</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:362
+#: apt-cache.8.xml:336
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -1624,46 +1651,46 @@ msgstr ""
 "Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:591
-#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89
+#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513
+#: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:596 apt-key.8.xml:175 apt-mark.8.xml:144
+#: apt-cache.8.xml:346 apt-get.8.xml:518 apt-key.8.xml:167 apt-mark.8.xml:126
 #: apt.conf.5.xml:1110 apt_preferences.5.xml:697
 msgid "Files"
 msgstr "Ficheros"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:348
 msgid "&file-sourceslist; &file-statelists;"
 msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:606
-#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704
-#: sources.list.5.xml:250
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94
+#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528
+#: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704
+#: sources.list.5.xml:255
 msgid "See Also"
 msgstr "Véase también"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:380
+#: apt-cache.8.xml:354
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:612
-#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99
+#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534
+#: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr "Diagnósticos"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:385
+#: apt-cache.8.xml:359
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1690,23 +1717,8 @@ msgstr "apt-cdrom"
 msgid "APT CDROM management utility"
 msgstr "Herramienta de APT para la gestión de discos ópticos"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cdrom.8.xml:38
-msgid ""
-"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
-"<arg>add</arg> <arg>ident</arg> </group>"
-msgstr ""
-"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>punto-de-montaje</replaceable></option></arg> "
-"<arg><option>-o=<replaceable>cadena-de-configuración</replaceable></option></"
-"arg> <arg><option>-c=<replaceable>fichero</replaceable></option></arg> "
-"<group> <arg>add</arg> <arg>ident</arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
+#: apt-cdrom.8.xml:38
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -1719,7 +1731,7 @@ msgstr ""
 "los ficheros de índice."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:45
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
@@ -1731,12 +1743,12 @@ msgstr ""
 "posibles errores de grabación."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:68
+#: apt-cdrom.8.xml:55
 msgid "add"
 msgstr "add"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:69
+#: apt-cdrom.8.xml:56
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@ -1751,7 +1763,7 @@ msgstr ""
 "título descriptivo."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:77
+#: apt-cdrom.8.xml:64
 msgid ""
 "APT uses a CDROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -1762,12 +1774,12 @@ msgstr ""
 "<filename>&statedir;/cdroms.list</filename>"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:84
+#: apt-cdrom.8.xml:71
 msgid "ident"
 msgstr "ident"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:85
+#: apt-cdrom.8.xml:72
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -1776,7 +1788,7 @@ msgstr ""
 "así como del nombre del fichero guardado."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:64
+#: apt-cdrom.8.xml:51
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present.  <placeholder type=\"variablelist"
@@ -1787,22 +1799,22 @@ msgstr ""
 "option>. <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:161
+#: apt-cdrom.8.xml:81 apt-key.8.xml:153
 msgid "Options"
 msgstr "Opciones"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
+#: apt-cdrom.8.xml:85 apt-ftparchive.1.xml:519 apt-get.8.xml:273
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98
+#: apt-cdrom.8.xml:85
 msgid "<option>--cdrom</option>"
 msgstr "<option>--cdrom</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:99
+#: apt-cdrom.8.xml:86
 msgid ""
 "Mount point; specify the location to mount the cdrom. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -1814,17 +1826,17 @@ msgstr ""
 "mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
+#: apt-cdrom.8.xml:94
 msgid "<option>-r</option>"
 msgstr "<option>-r</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
+#: apt-cdrom.8.xml:94
 msgid "<option>--rename</option>"
 msgstr "<option>--rename</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:108
+#: apt-cdrom.8.xml:95
 msgid ""
 "Rename a disc; change the label of a disk or override the disks given label. "
 "This option will cause <command>apt-cdrom</command> to prompt for a new "
@@ -1836,17 +1848,17 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116 apt-get.8.xml:375
+#: apt-cdrom.8.xml:103 apt-get.8.xml:292
 msgid "<option>-m</option>"
 msgstr "<option>-m</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116
+#: apt-cdrom.8.xml:103
 msgid "<option>--no-mount</option>"
 msgstr "<option>--no-mount</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:117
+#: apt-cdrom.8.xml:104
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -1856,12 +1868,12 @@ msgstr ""
 "de montaje. Opción de configuración: <literal>APT::CDROM::NoMount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:124
+#: apt-cdrom.8.xml:111
 msgid "<option>--fast</option>"
 msgstr "<option>--fast</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:125
+#: apt-cdrom.8.xml:112
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1874,12 +1886,12 @@ msgstr ""
 "de configuración: <literal>APT::CDROM::Fast</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:134
+#: apt-cdrom.8.xml:121
 msgid "<option>--thorough</option>"
 msgstr "<option>--thorough</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:135
+#: apt-cdrom.8.xml:122
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1891,22 +1903,22 @@ msgstr ""
 "pero encontrará todo el contenido."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:143 apt-get.8.xml:406
+#: apt-cdrom.8.xml:130 apt-get.8.xml:323
 msgid "<option>--just-print</option>"
 msgstr "<option>--just-print</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:144 apt-get.8.xml:408
+#: apt-cdrom.8.xml:131 apt-get.8.xml:325
 msgid "<option>--recon</option>"
 msgstr "<option>--recon</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:145 apt-get.8.xml:409
+#: apt-cdrom.8.xml:132 apt-get.8.xml:326
 msgid "<option>--no-act</option>"
 msgstr "<option>--no-act</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:133
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -1917,12 +1929,12 @@ msgstr ""
 "CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:159
+#: apt-cdrom.8.xml:146
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:164
+#: apt-cdrom.8.xml:151
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1951,21 +1963,8 @@ msgstr "apt-config"
 msgid "APT Configuration Query program"
 msgstr "Programa para consultar la configuración de APT"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-config.8.xml:39
-msgid ""
-"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>shell</arg> <arg>dump</arg> </group>"
-msgstr ""
-"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
-"o=<replaceable>cadena-de-configuración</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>fichero</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:51
+#: apt-config.8.xml:39
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -1979,7 +1978,7 @@ msgstr ""
 "sencillo de usar por aplicaciones con scripts."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:56 apt-ftparchive.1.xml:75
+#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present."
@@ -1989,12 +1988,12 @@ msgstr ""
 "option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:49
 msgid "shell"
 msgstr "shell"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:63
+#: apt-config.8.xml:51
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
@@ -2010,7 +2009,7 @@ msgstr ""
 "manera en un script:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:71
+#: apt-config.8.xml:59
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -2022,7 +2021,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:76
+#: apt-config.8.xml:64
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -2031,7 +2030,7 @@ msgstr ""
 "valor de MyApp::Opciones, y con <option>-f</option> por omisión."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:80
+#: apt-config.8.xml:68
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -2044,18 +2043,18 @@ msgstr ""
 "internamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:89
+#: apt-config.8.xml:77
 msgid "Just show the contents of the configuration space."
 msgstr "Sólo muestra el contenido del espacio de configuración."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
-#: apt-sortpkgs.1.xml:73
+#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112
+#: apt-config.8.xml:100
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2080,21 +2079,8 @@ msgstr ""
 "Herramienta para extraer la configuración de DebConf y las plantillas de los "
 "paquetes de Debian"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-extracttemplates.1.xml:39
-msgid ""
-"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-"<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
-"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
-"arg>"
-msgstr ""
-"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-"<arg><option>-t=<replaceable>directorio-temporal</replaceable></option></"
-"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>fichero</"
-"replaceable></arg>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:39
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -2109,12 +2095,12 @@ msgstr ""
 "plantillas, se generará una salida de una línea con el formato:"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:52
+#: apt-extracttemplates.1.xml:44
 msgid "package version template-file config-script"
 msgstr "paquete versión fichero-de-plantilla script-de-configuración"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:53
+#: apt-extracttemplates.1.xml:45
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
@@ -2128,17 +2114,17 @@ msgstr ""
 "<filename>paquete.config.XXXX</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63 apt-get.8.xml:525
+#: apt-extracttemplates.1.xml:55 apt-get.8.xml:447
 msgid "<option>-t</option>"
 msgstr "<option>-t</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63
+#: apt-extracttemplates.1.xml:55
 msgid "<option>--tempdir</option>"
 msgstr "<option>--tempdir</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:65
+#: apt-extracttemplates.1.xml:57
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@ -2149,7 +2135,7 @@ msgstr ""
 "<literal>APT::ExtractTemplates::TempDir</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:82
+#: apt-extracttemplates.1.xml:74
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -2177,51 +2163,8 @@ msgstr "apt-ftparchive"
 msgid "Utility to generate index files"
 msgstr "Herramienta para generar ficheros de índice"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-ftparchive.1.xml:39
-msgid ""
-"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
-"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
-"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
-"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-"replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
-"arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
-"arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
-"replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
-"\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
-msgstr ""
-"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-"arg> <arg><option>--arch <replaceable>arquitectura</replaceable></option></"
-"arg> <arg><option>-o <replaceable>configuración</"
-"replaceable>=<replaceable>cadena</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>fichero</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>packages<arg choice=\"plain\" rep=\"repeat\"><replaceable>ruta</"
-"replaceable></arg><arg><replaceable>fichero-alternativo</"
-"replaceable><arg><replaceable>prefijo-ruta</replaceable></arg></arg></arg> "
-"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>ruta</"
-"replaceable></arg><arg><replaceable>fichero-alternativo</"
-"replaceable><arg><replaceable>prefijo-ruta</replaceable></arg></arg></arg> "
-"<arg>contents <arg choice=\"plain\"><replaceable>ruta</replaceable></arg></"
-"arg> <arg>release <arg choice=\"plain\"><replaceable>ruta</replaceable></"
-"arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>fichero-"
-"configuración</replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>sección</replaceable></arg></arg> <arg>clean <arg choice="
-"\"plain\"><replaceable>fichero-configuración</replaceable></arg></arg> </"
-"group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -2234,7 +2177,7 @@ msgstr ""
 "de origen basado en el contenido de ese sitio."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:64
+#: apt-ftparchive.1.xml:43
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -2249,7 +2192,7 @@ msgstr ""
 "«script» para el proceso de generación de un archivo completo."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:70
+#: apt-ftparchive.1.xml:49
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -2264,12 +2207,12 @@ msgstr ""
 "los ficheros y genera los ficheros de salida comprimidos deseados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:79
+#: apt-ftparchive.1.xml:58
 msgid "packages"
 msgstr "packages"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:81
+#: apt-ftparchive.1.xml:60
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -2282,7 +2225,7 @@ msgstr ""
 "orden es casi un equivalente de &dpkg-scanpackages;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
+#: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
@@ -2290,12 +2233,12 @@ msgstr ""
 "datos binaria para la caché (registro de paquetes)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:89
+#: apt-ftparchive.1.xml:68
 msgid "sources"
 msgstr "sources"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:70
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -2309,7 +2252,7 @@ msgstr ""
 "scansources;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:75
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -2320,12 +2263,12 @@ msgstr ""
 "para cambiar el fichero de fuentes alternativo que se usará."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:101
+#: apt-ftparchive.1.xml:80
 msgid "contents"
 msgstr "contents"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:103
+#: apt-ftparchive.1.xml:82
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -2343,12 +2286,12 @@ msgstr ""
 "por una coma en la salida."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:113
+#: apt-ftparchive.1.xml:92
 msgid "release"
 msgstr "release"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:115
+#: apt-ftparchive.1.xml:94
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -2363,7 +2306,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:125
+#: apt-ftparchive.1.xml:104
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -2384,12 +2327,12 @@ msgstr ""
 "<literal>Components</literal> y <literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:115
 msgid "generate"
 msgstr "generate"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:138
+#: apt-ftparchive.1.xml:117
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -2405,12 +2348,12 @@ msgstr ""
 "configuración necesaria."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
+#: apt-ftparchive.1.xml:124 apt-get.8.xml:215
 msgid "clean"
 msgstr "clean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:126
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -2420,12 +2363,12 @@ msgstr ""
 "necesarios."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:153
+#: apt-ftparchive.1.xml:132
 msgid "The Generate Configuration"
 msgstr "La configuración de «generate»"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:134
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -2443,7 +2386,7 @@ msgstr ""
 "etiqueta."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:163
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
@@ -2451,12 +2394,12 @@ msgstr ""
 "describen a continuación."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:144
 msgid "Dir Section"
 msgstr "Sección Dir"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:146
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -2469,12 +2412,12 @@ msgstr ""
 "secciones posteriores para producir una ruta absoluta."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:151
 msgid "ArchiveDir"
 msgstr "Sección ArchiveDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:153
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2485,32 +2428,32 @@ msgstr ""
 "«dist»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:179
+#: apt-ftparchive.1.xml:158
 msgid "OverrideDir"
 msgstr "Sección OverrideDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:160
 msgid "Specifies the location of the override files."
 msgstr "Define la ubicación de los ficheros alternativos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:184
+#: apt-ftparchive.1.xml:163
 msgid "CacheDir"
 msgstr "Sección CacheDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:165
 msgid "Specifies the location of the cache files"
 msgstr "Define la ubicación de los ficheros de la caché."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:189
+#: apt-ftparchive.1.xml:168
 msgid "FileListDir"
 msgstr "Sección FileListDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:170
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -2519,12 +2462,12 @@ msgstr ""
 "posteriormente el valor <literal>FileList</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:176
 msgid "Default Section"
 msgstr "Sección Default"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:199
+#: apt-ftparchive.1.xml:178
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -2535,12 +2478,12 @@ msgstr ""
 "sobrescribir estos valores predeterminados con un valor de la sección."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
+#: apt-ftparchive.1.xml:182
 msgid "Packages::Compress"
 msgstr "Packages::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:184
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -2554,12 +2497,12 @@ msgstr ""
 "compresión es «. gzip»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:190
 msgid "Packages::Extensions"
 msgstr "Packages::Extensions"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:213
+#: apt-ftparchive.1.xml:192
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -2568,12 +2511,12 @@ msgstr ""
 "paquete. El valor predeterminado es «.deb»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:196
 msgid "Sources::Compress"
 msgstr "Sources::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:219
+#: apt-ftparchive.1.xml:198
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -2582,12 +2525,12 @@ msgstr ""
 "controla la compresión para los ficheros «Sources»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:202
 msgid "Sources::Extensions"
 msgstr "Sources::Extensions"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:225
+#: apt-ftparchive.1.xml:204
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -2596,12 +2539,12 @@ msgstr ""
 "ficheros de fuentes. El valor predeterminado es «.dsc»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:208
 msgid "Contents::Compress"
 msgstr "Contents::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:210
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -2610,12 +2553,12 @@ msgstr ""
 "controla la compresión para los ficheros «Contents»."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:214
 msgid "Translation::Compress"
 msgstr "Translation::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:237
+#: apt-ftparchive.1.xml:216
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
@@ -2624,12 +2567,12 @@ msgstr ""
 "controla la compresión para el fichero maestro Translation-en."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
+#: apt-ftparchive.1.xml:220
 msgid "DeLinkLimit"
 msgstr "DeLinkLimit"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:222
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -2640,12 +2583,12 @@ msgstr ""
 "cada sección."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248
+#: apt-ftparchive.1.xml:227
 msgid "FileMode"
 msgstr "FileMode"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:229
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
@@ -2655,12 +2598,12 @@ msgstr ""
 "sin tener en cuenta la máscara de usuario («umask»)."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
+#: apt-ftparchive.1.xml:234 apt-ftparchive.1.xml:380
 msgid "LongDescription"
 msgstr "LongDescription"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+#: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
@@ -2670,12 +2613,12 @@ msgstr ""
 "en»."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:263
+#: apt-ftparchive.1.xml:242
 msgid "TreeDefault Section"
 msgstr "Sección TreeDefault"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml:244
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -2686,12 +2629,12 @@ msgstr ""
 "$(DIST), $(SECTION) y $(ARCH) con sus valores respectivos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:249
 msgid "MaxContentsChange"
 msgstr "MaxContentsChange"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:272
+#: apt-ftparchive.1.xml:251
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -2702,12 +2645,12 @@ msgstr ""
 "que durante varios días todos se regenerarán."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:256
 msgid "ContentsAge"
 msgstr "ContentsAge"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:279
+#: apt-ftparchive.1.xml:258
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -2726,12 +2669,12 @@ msgstr ""
 "unidades usadas son días."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:267
 msgid "Directory"
 msgstr "Directory"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:290
+#: apt-ftparchive.1.xml:269
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -2740,12 +2683,12 @@ msgstr ""
 "$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:273
 msgid "SrcDirectory"
 msgstr "SrcDirectory"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:296
+#: apt-ftparchive.1.xml:275
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -2754,12 +2697,12 @@ msgstr ""
 "predeterminado es <filename>$(DIST)/$(SECTION)/source/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:418
 msgid "Packages"
 msgstr "Packages"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:281
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -2768,12 +2711,12 @@ msgstr ""
 "$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:306 apt-ftparchive.1.xml:444
+#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:423
 msgid "Sources"
 msgstr "Sources"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:287
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -2782,12 +2725,12 @@ msgstr ""
 "$(DIST)/$(SECTION)/source/Sources</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
+#: apt-ftparchive.1.xml:291
 msgid "Translation"
 msgstr "Translation"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:293
 msgid ""
 "Set the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
@@ -2799,12 +2742,12 @@ msgstr ""
 "filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319
+#: apt-ftparchive.1.xml:298
 msgid "InternalPrefix"
 msgstr "InternalPrefix"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:300
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -2815,12 +2758,12 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:305 apt-ftparchive.1.xml:429
 msgid "Contents"
 msgstr "Contents"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:307
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
@@ -2834,23 +2777,23 @@ msgstr ""
 "esos ficheros de paquete juntos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:314
 msgid "Contents::Header"
 msgstr "Contents::Header"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:316
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 "Define el fichero de cabecera a añadir al fichero «Contents» de salida."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:340 apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:454
 msgid "BinCacheDB"
 msgstr "BinCacheDB"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:342
+#: apt-ftparchive.1.xml:321
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -2859,12 +2802,12 @@ msgstr ""
 "Varias secciones pueden compartir la misma base de datos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:325
 msgid "FileList"
 msgstr "FileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:327
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -2876,12 +2819,12 @@ msgstr ""
 "como prefijo el directorio del archivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:353
+#: apt-ftparchive.1.xml:332
 msgid "SourceFileList"
 msgstr "SourceFileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:355
+#: apt-ftparchive.1.xml:334
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -2895,12 +2838,12 @@ msgstr ""
 "índices de fuentes."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:342
 msgid "Tree Section"
 msgstr "Sección Tree"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:365
+#: apt-ftparchive.1.xml:344
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -2915,7 +2858,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:349
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -2928,7 +2871,7 @@ msgstr ""
 "valor como <filename>dists/&stable-codename;</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:375
+#: apt-ftparchive.1.xml:354
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
@@ -2939,7 +2882,7 @@ msgstr ""
 "variables."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:381
+#: apt-ftparchive.1.xml:360
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -2953,7 +2896,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:378
+#: apt-ftparchive.1.xml:357
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -2964,12 +2907,12 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
+#: apt-ftparchive.1.xml:366
 msgid "Sections"
 msgstr "Secciones"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389
+#: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"
@@ -2980,12 +2923,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
+#: apt-ftparchive.1.xml:373 apt.conf.5.xml:157
 msgid "Architectures"
 msgstr "Arquitecturas"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:375
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -2996,12 +2939,12 @@ msgstr ""
 "indicar que este árbol tiene un fichero de fuentes."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:434
 msgid "BinOverride"
 msgstr "BinOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:388
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -3010,12 +2953,12 @@ msgstr ""
 "sección, la prioridad y la dirección del mantenedor."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:439
 msgid "SrcOverride"
 msgstr "SrcOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:415
+#: apt-ftparchive.1.xml:394
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -3024,32 +2967,32 @@ msgstr ""
 "la sección."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
+#: apt-ftparchive.1.xml:398 apt-ftparchive.1.xml:444
 msgid "ExtraOverride"
 msgstr "ExtraOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
 msgid "Sets the binary extra override file."
 msgstr "Define el fichero binario alternativo adicional."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:424 apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:403 apt-ftparchive.1.xml:449
 msgid "SrcExtraOverride"
 msgstr "SrcExtraOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
+#: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
 msgid "Sets the source extra override file."
 msgstr "Define el fichero de fuentes alternativo adicional."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:431
+#: apt-ftparchive.1.xml:410
 msgid "BinDirectory Section"
 msgstr "Sección BinDirectory"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:412
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -3064,12 +3007,12 @@ msgstr ""
 "<literal>Section</literal><literal>Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:441
+#: apt-ftparchive.1.xml:420
 msgid "Sets the Packages file output."
 msgstr "Define el fichero «Packages» de salida."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:446
+#: apt-ftparchive.1.xml:425
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -3078,52 +3021,52 @@ msgstr ""
 "<literal>Packages</literal> o <literal>Sources</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml:431
 msgid "Sets the Contents file output. (optional)"
 msgstr "Define el fichero «Contents» de salida. (Opcional)"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:457
+#: apt-ftparchive.1.xml:436
 msgid "Sets the binary override file."
 msgstr "Define el fichero binario alternativo."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:441
 msgid "Sets the source override file."
 msgstr "Define el fichero de fuentes alternativo."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:477
+#: apt-ftparchive.1.xml:456
 msgid "Sets the cache DB."
 msgstr "Define la base de datos de la caché."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:459
 msgid "PathPrefix"
 msgstr "PathPrefix"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:461
 msgid "Appends a path to all the output paths."
 msgstr "Añade una ruta a todas las rutas de salida."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:464
 msgid "FileList, SourceFileList"
 msgstr "FileList, SourceFileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:466
 msgid "Specifies the file list file."
 msgstr "Define el fichero de la lista de ficheros."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:473
 msgid "The Binary Override File"
 msgstr "El fichero binario alternativo"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:495
+#: apt-ftparchive.1.xml:474
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -3138,19 +3081,19 @@ msgstr ""
 "de permutación del mantenedor."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:480
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "antigua [// antigua-n]* => nueva"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:482
 #, no-wrap
 msgid "new"
 msgstr "nueva"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:500
+#: apt-ftparchive.1.xml:479
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3167,12 +3110,12 @@ msgstr ""
 "segunda forma sustituye de forma incondicional el campo del mantenedor."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:490
 msgid "The Source Override File"
 msgstr "El fichero de fuentes alternativo"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:513
+#: apt-ftparchive.1.xml:492
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -3183,12 +3126,12 @@ msgstr ""
 "nombre del paquete fuente, el segundo es la sección a la que se asignará."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:497
 msgid "The Extra Override File"
 msgstr "El fichero alternativo adicional"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:520
+#: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -3199,13 +3142,23 @@ msgstr ""
 "paquete, la segunda es la etiqueta y el resto de la línea es el nuevo valor."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:508
 msgid ""
 "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml:510
+#, fuzzy
+#| msgid ""
+#| "Values for the additional metadata fields in the Release file are taken "
+#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
+#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
+#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
+#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
+#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-"
+#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</"
+#| "literal>, <literal>Description</literal>."
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -3217,14 +3170,22 @@ msgid ""
 "literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
 "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
 msgstr ""
+"Los valores para los campos de metadatos adicionales en el fichero «Release» "
+"se toman de las variables correspondientes en <literal>APT::FTPArchive::"
+"Release</literal>, por ejemplo <literal>APT::FTPArchive::Release::Origin</"
+"literal>. Los campos permitidos son: <literal>Origin</literal>, "
+"<literal>Label</literal>, <literal>Suite</literal>, <literal>Version</"
+"literal>, <literal>Codename</literal>, <literal>Date</literal>, "
+"<literal>Valid-Until</literal>, <literal>Architectures</literal>, "
+"<literal>Components</literal> y <literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:540
+#: apt-ftparchive.1.xml:519
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:521
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3233,7 +3194,7 @@ msgstr ""
 "«generate». Opción de configuración: <literal>APT::FTPArchive::DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:548
+#: apt-ftparchive.1.xml:527
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3247,12 +3208,12 @@ msgstr ""
 "configuración. Opción de configuración: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:554
+#: apt-ftparchive.1.xml:533
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:556
+#: apt-ftparchive.1.xml:535
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3265,12 +3226,12 @@ msgstr ""
 "Opción de configuración: <literal>APT::FTPArchive::DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:562
+#: apt-ftparchive.1.xml:541
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:564
+#: apt-ftparchive.1.xml:543
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3287,12 +3248,12 @@ msgstr ""
 "Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:572
+#: apt-ftparchive.1.xml:551
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:553
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3303,12 +3264,12 @@ msgstr ""
 "FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:578
+#: apt-ftparchive.1.xml:557
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:559
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3317,12 +3278,12 @@ msgstr ""
 "Opción de configuración: <literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:584
+#: apt-ftparchive.1.xml:563
 msgid "<option>--arch</option>"
 msgstr "<option>--arch</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:585
+#: apt-ftparchive.1.xml:564
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3336,12 +3297,12 @@ msgstr ""
 "FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:591
+#: apt-ftparchive.1.xml:570
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:593
+#: apt-ftparchive.1.xml:572
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3365,12 +3326,12 @@ msgstr ""
 "comprobaciones adicionales son innecesarias."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:603
+#: apt-ftparchive.1.xml:582
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:605
+#: apt-ftparchive.1.xml:584
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3386,19 +3347,19 @@ msgstr ""
 "con la orden «generate»."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544
-#: sources.list.5.xml:209
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1104 apt_preferences.5.xml:544
+#: sources.list.5.xml:214
 msgid "Examples"
 msgstr "Ejemplos"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:623
+#: apt-ftparchive.1.xml:602
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>directorio</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:619
+#: apt-ftparchive.1.xml:598
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3407,7 +3368,7 @@ msgstr ""
 "paquetes binarios («.deb»): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:633
+#: apt-ftparchive.1.xml:612
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3436,96 +3397,8 @@ msgid "APT package handling utility -- command-line interface"
 msgstr ""
 "Herramienta de gestión de paquetes APT -- interfaz para la línea de órdenes"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-get.8.xml:39
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
-#| "<arg> <option>-t=</option> <arg choice='plain'> "
-#| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
-#| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
-#| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
-#| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
-#| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-#| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-#| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
-#| "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#| "<group choice='req'> <arg choice='plain'> "
-#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#| "help</arg> </group> </arg> </group>"
-msgid ""
-"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
-"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
-"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
-"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> "
-"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice="
-"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
-"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
-"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
-"arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
-"<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-"<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
-"</group> </arg> </group>"
-msgstr ""
-"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>cadena-de-configuración</replaceable> </option> </"
-"arg> <arg> <option>-c= <replaceable>fichero-de-configuración</replaceable> </"
-"option> </arg> <arg> <option>-t=</option> <arg choice='plain'> "
-"<replaceable>nombre-de-la-versión-objetivo</replaceable> </arg> </arg> "
-"<group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
-"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable> <arg> <group "
-"choice='req'> <arg choice='plain'> =<replaceable>versión-del-paquete</"
-"replaceable> </arg> <arg choice='plain'> /<replaceable>nombre-de-la-versión-"
-"objetivo</replaceable> </arg> </group> </arg> </arg> </arg> <arg "
-"choice='plain'>remove <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>paquete</replaceable></arg></arg> <arg choice='plain'>purge "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable></"
-"arg></arg> <arg choice='plain'>source <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>paquete</replaceable> <arg> <group choice='req'> <arg "
-"choice='plain'> =<replaceable>versión-del-paquete</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>nombre-de-la-versión-objetivo</replaceable> </"
-"arg> </group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable></arg></arg> <arg "
-"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
-"</group> </arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:122
+#: apt-get.8.xml:39
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
@@ -3539,12 +3412,12 @@ msgstr ""
 "&synaptic; y &wajig;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:131 apt-key.8.xml:127
+#: apt-get.8.xml:48 apt-key.8.xml:119
 msgid "update"
 msgstr "update"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:132
+#: apt-get.8.xml:49
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -3568,12 +3441,12 @@ msgstr ""
 "tamaño de los archivos de paquete."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:143 guide.sgml:121
+#: apt-get.8.xml:60 guide.sgml:121
 msgid "upgrade"
 msgstr "upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:144
+#: apt-get.8.xml:61
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -3598,12 +3471,12 @@ msgstr ""
 "hay nuevas versiones disponibles."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:156
+#: apt-get.8.xml:73
 msgid "dselect-upgrade"
 msgstr "dselect-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:157
+#: apt-get.8.xml:74
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -3620,12 +3493,12 @@ msgstr ""
 "paquetes antiguos e instalar las nuevas versiones)."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:166 guide.sgml:140
+#: apt-get.8.xml:83 guide.sgml:140
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:167
+#: apt-get.8.xml:84
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3648,12 +3521,12 @@ msgstr ""
 "comportamiento para paquetes individuales."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:179 guide.sgml:131
+#: apt-get.8.xml:96 guide.sgml:131
 msgid "install"
 msgstr "install"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:181
+#: apt-get.8.xml:98
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -3681,7 +3554,7 @@ msgstr ""
 "conflictos de apt-get."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:116
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -3699,7 +3572,7 @@ msgstr ""
 "(stable, testing, unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:123
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -3708,7 +3581,7 @@ msgstr ""
 "anterior de los paquetes y se debe usar con cuidado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:209
+#: apt-get.8.xml:126
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -3728,7 +3601,7 @@ msgstr ""
 "instalarán."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:220
+#: apt-get.8.xml:137
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -3737,7 +3610,7 @@ msgstr ""
 "paquetes individuales."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:141
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -3757,12 +3630,12 @@ msgstr ""
 "«$», o bien crear una expresión regular más específica."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:233
+#: apt-get.8.xml:150
 msgid "remove"
 msgstr "remove"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:151
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -3778,12 +3651,12 @@ msgstr ""
 "cuestión será instalado en vez de eliminado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:241
+#: apt-get.8.xml:158
 msgid "purge"
 msgstr "purge"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:242
+#: apt-get.8.xml:159
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -3794,12 +3667,12 @@ msgstr ""
 "también cualquier fichero de configuración)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:163
 msgid "source"
 msgstr "source"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:247
+#: apt-get.8.xml:164
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -3818,7 +3691,7 @@ msgstr ""
 "release</literal>, si es posible."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:255
+#: apt-get.8.xml:172
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> type lines in the &sources-list; file. This means that you "
@@ -3834,7 +3707,7 @@ msgstr ""
 "instalada o de la que podría instalar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:179
 #, fuzzy
 #| msgid ""
 #| "If the <option>--compile</option> option is specified then the package "
@@ -3854,7 +3727,7 @@ msgstr ""
 "desempaquetará."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:186
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -3869,7 +3742,7 @@ msgstr ""
 "activando implícitamente la opción <literal>APT::Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:275
+#: apt-get.8.xml:192
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -3880,12 +3753,12 @@ msgstr ""
 "tar comprimidos con las fuentes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:280
+#: apt-get.8.xml:197
 msgid "build-dep"
 msgstr "build-dep"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:281
+#: apt-get.8.xml:198
 #, fuzzy
 #| msgid ""
 #| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
@@ -3902,12 +3775,12 @@ msgstr ""
 "fuente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
+#: apt-get.8.xml:204
 msgid "check"
 msgstr "check"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:205
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -3916,19 +3789,19 @@ msgstr ""
 "caché de paquetes y revisa la existencia de dependencias rotas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:209
 msgid "download"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:210
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:299
+#: apt-get.8.xml:216
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -3947,12 +3820,12 @@ msgstr ""
 "literal> de vez en cuando para liberar algo de espacio en disco."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:225
 msgid "autoclean"
 msgstr "autoclean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:309
+#: apt-get.8.xml:226
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -3971,12 +3844,12 @@ msgstr ""
 "desactivada impedirá que se borren los paquetes instalados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:318
+#: apt-get.8.xml:235
 msgid "autoremove"
 msgstr "autoremove"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
+#: apt-get.8.xml:236
 #, fuzzy
 #| msgid ""
 #| "<literal>autoremove</literal> is used to remove packages that were "
@@ -3992,12 +3865,12 @@ msgstr ""
 "paquete, pero que ya no son necesarios."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323
+#: apt-get.8.xml:240
 msgid "changelog"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:241
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -4010,12 +3883,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:346
+#: apt-get.8.xml:263
 msgid "<option>--no-install-recommends</option>"
 msgstr "<option>--no-install-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:264
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -4024,14 +3897,14 @@ msgstr ""
 "de configuración: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:351
+#: apt-get.8.xml:268
 #, fuzzy
 #| msgid "<option>--no-suggests</option>"
 msgid "<option>--install-suggests</option>"
 msgstr "<option>--no-suggests</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml:269
 #, fuzzy
 #| msgid ""
 #| "Do not consider recommended packages as a dependency for installing.  "
@@ -4044,12 +3917,12 @@ msgstr ""
 "de configuración: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:356
+#: apt-get.8.xml:273
 msgid "<option>--download-only</option>"
 msgstr "<option>--download-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:357
+#: apt-get.8.xml:274
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -4058,12 +3931,12 @@ msgstr ""
 "instala. Opción de configuración: <literal>APT::Get::Download-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:361
+#: apt-get.8.xml:278
 msgid "<option>--fix-broken</option>"
 msgstr "<option>--fix-broken</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:362
+#: apt-get.8.xml:279
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
@@ -4091,17 +3964,17 @@ msgstr ""
 "<literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:375
+#: apt-get.8.xml:292
 msgid "<option>--ignore-missing</option>"
 msgstr "<option>--ignore-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:376
+#: apt-get.8.xml:293
 msgid "<option>--fix-missing</option>"
 msgstr "<option>--fix-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:294
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -4121,12 +3994,12 @@ msgstr ""
 "<literal>APT::Get::Fix-Missing</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:387
+#: apt-get.8.xml:304
 msgid "<option>--no-download</option>"
 msgstr "<option>--no-download</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:388
+#: apt-get.8.xml:305
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -4138,7 +4011,7 @@ msgstr ""
 "<literal>APT::Get::Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:395
+#: apt-get.8.xml:312
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -4159,17 +4032,17 @@ msgstr ""
 "<literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:405
+#: apt-get.8.xml:322
 msgid "<option>--simulate</option>"
 msgstr "<option>--simulate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:407
+#: apt-get.8.xml:324
 msgid "<option>--dry-run</option>"
 msgstr "<option>--dry-run</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:410
+#: apt-get.8.xml:327
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -4180,7 +4053,7 @@ msgstr ""
 "Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:331
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "
@@ -4198,7 +4071,7 @@ msgstr ""
 "avisos de <literal>apt-get</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:337
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4212,22 +4085,22 @@ msgstr ""
 "problema (poco probable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:344
 msgid "<option>-y</option>"
 msgstr "<option>-y</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:344
 msgid "<option>--yes</option>"
 msgstr "<option>--yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:428
+#: apt-get.8.xml:345
 msgid "<option>--assume-yes</option>"
 msgstr "<option>--assume-yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:429
+#: apt-get.8.xml:346
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -4243,17 +4116,37 @@ msgstr ""
 "<literal>APT::Get::Assume-Yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:353
+#, fuzzy
+#| msgid "<option>--assume-yes</option>"
+msgid "<option>--assume-no</option>"
+msgstr "<option>--assume-yes</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:354
+#, fuzzy
+#| msgid ""
+#| "Compile source packages after downloading them.  Configuration Item: "
+#| "<literal>APT::Get::Compile</literal>."
+msgid ""
+"Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
+"Assume-No</literal>."
+msgstr ""
+"Descarga los paquetes fuente y luego los compila. Opción de configuración: "
+"<literal>APT::Get::Compile</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:358
 msgid "<option>-u</option>"
 msgstr "<option>-u</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:358
 msgid "<option>--show-upgraded</option>"
 msgstr "<option>--show-upgraded</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:437
+#: apt-get.8.xml:359
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4262,17 +4155,17 @@ msgstr ""
 "<literal>APT::Get::Show-Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:364
 msgid "<option>-V</option>"
 msgstr "<option>-V</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:364
 msgid "<option>--verbose-versions</option>"
 msgstr "<option>--verbose-versions</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:365
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -4281,14 +4174,14 @@ msgstr ""
 "Opción de configuración: <literal>APT::Get::Show-Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:370
 #, fuzzy
 #| msgid "<option>--recurse</option>"
 msgid "<option>--host-architecture</option>"
 msgstr "<option>--recurse</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:371
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
@@ -4299,22 +4192,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:379
 msgid "<option>-b</option>"
 msgstr "<option>-b</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:379
 msgid "<option>--compile</option>"
 msgstr "<option>--compile</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:458
+#: apt-get.8.xml:380
 msgid "<option>--build</option>"
 msgstr "<option>--build</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:459
+#: apt-get.8.xml:381
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -4323,12 +4216,12 @@ msgstr ""
 "<literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:385
 msgid "<option>--ignore-hold</option>"
 msgstr "<option>--ignore-hold</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:464
+#: apt-get.8.xml:386
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -4342,12 +4235,12 @@ msgstr ""
 "Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:470
+#: apt-get.8.xml:392
 msgid "<option>--no-upgrade</option>"
 msgstr "<option>--no-upgrade</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:393
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4360,12 +4253,12 @@ msgstr ""
 "<literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:477
+#: apt-get.8.xml:399
 msgid "<option>--only-upgrade</option>"
 msgstr "<option>--only-upgrade</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:478
+#: apt-get.8.xml:400
 msgid ""
 "Do not install new packages; When used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will prevent packages on the "
@@ -4378,12 +4271,12 @@ msgstr ""
 "de configuración: <literal>APT::Get::Only-Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:484
+#: apt-get.8.xml:406
 msgid "<option>--force-yes</option>"
 msgstr "<option>--force-yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:485
+#: apt-get.8.xml:407
 msgid ""
 "Force yes; This is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -4399,12 +4292,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:492
+#: apt-get.8.xml:414
 msgid "<option>--print-uris</option>"
 msgstr "<option>--print-uris</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:493
+#: apt-get.8.xml:415
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected md5 "
@@ -4426,12 +4319,12 @@ msgstr ""
 "<literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:503
+#: apt-get.8.xml:425
 msgid "<option>--purge</option>"
 msgstr "<option>--purge</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:504
+#: apt-get.8.xml:426
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -4445,12 +4338,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
+#: apt-get.8.xml:433
 msgid "<option>--reinstall</option>"
 msgstr "<option>--reinstall</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:434
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4460,12 +4353,12 @@ msgstr ""
 "ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:516
+#: apt-get.8.xml:438
 msgid "<option>--list-cleanup</option>"
 msgstr "<option>--list-cleanup</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:517
+#: apt-get.8.xml:439
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -4483,17 +4376,17 @@ msgstr ""
 "<literal>APT::Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:448
 msgid "<option>--target-release</option>"
 msgstr "<option>--target-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:527
+#: apt-get.8.xml:449
 msgid "<option>--default-release</option>"
 msgstr "<option>--default-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:450
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -4517,12 +4410,12 @@ msgstr ""
 "también la página del manual de &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:541
+#: apt-get.8.xml:463
 msgid "<option>--trivial-only</option>"
 msgstr "<option>--trivial-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:465
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4536,12 +4429,12 @@ msgstr ""
 "<literal>APT::Get::Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
+#: apt-get.8.xml:471
 msgid "<option>--no-remove</option>"
 msgstr "<option>--no-remove</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:550
+#: apt-get.8.xml:472
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4550,12 +4443,12 @@ msgstr ""
 "preguntar. Opción de configuración: <literal>APT::Get::Remove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:477
 msgid "<option>--auto-remove</option>"
 msgstr "<option>--auto-remove</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:556
+#: apt-get.8.xml:478
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4568,12 +4461,12 @@ msgstr ""
 "configuración: <literal>APT::Get::AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:562
+#: apt-get.8.xml:484
 msgid "<option>--only-source</option>"
 msgstr "<option>--only-source</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:563
+#: apt-get.8.xml:485
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -4593,22 +4486,22 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--diff-only</option>"
 msgstr "<option>--diff-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--dsc-only</option>"
 msgstr "<option>--dsc-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--tar-only</option>"
 msgstr "<option>--tar-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:574
+#: apt-get.8.xml:496
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4619,12 +4512,12 @@ msgstr ""
 "Dsc-Only</literal> y <literal>APT::Get::Tar-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:579
+#: apt-get.8.xml:501
 msgid "<option>--arch-only</option>"
 msgstr "<option>--arch-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:580
+#: apt-get.8.xml:502
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -4633,12 +4526,12 @@ msgstr ""
 "arquitectura. Opción de configuración: <literal>APT::Get::Arch-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:584
+#: apt-get.8.xml:506
 msgid "<option>--allow-unauthenticated</option>"
 msgstr "<option>--allow-unauthenticated</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:585
+#: apt-get.8.xml:507
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -4649,7 +4542,7 @@ msgstr ""
 "configuración: <literal>APT::Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:598
+#: apt-get.8.xml:520
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
@@ -4658,7 +4551,7 @@ msgstr ""
 "&file-statelists;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:607
+#: apt-get.8.xml:529
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -4669,7 +4562,7 @@ msgstr ""
 "preferences;, el Cómo de APT."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:613
+#: apt-get.8.xml:535
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -4678,22 +4571,22 @@ msgstr ""
 "100 en caso de error."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:616
+#: apt-get.8.xml:538
 msgid "ORIGINAL AUTHORS"
 msgstr "AUTORES ORIGINALES"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:617
+#: apt-get.8.xml:539
 msgid "&apt-author.jgunthorpe;"
 msgstr "&apt-author.jgunthorpe;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:620
+#: apt-get.8.xml:542
 msgid "CURRENT AUTHORS"
 msgstr "AUTORES ACTUALES"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:622
+#: apt-get.8.xml:544
 msgid "&apt-author.team;"
 msgstr "&apt-author.team;"
 
@@ -4707,21 +4600,8 @@ msgstr "apt-key"
 msgid "APT key management utility"
 msgstr "Herramienta para gestionar las claves de APT"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-key.8.xml:31
-msgid ""
-"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
-"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
-"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
-"arg>"
-msgstr ""
-"<command>apt-key</command> <arg><option>--keyring <replaceable>nombre-de-"
-"fichero</replaceable></option></arg> <arg><replaceable>orden</replaceable></"
-"arg> <arg rep=\"repeat\"><option><replaceable>argumentis</replaceable></"
-"option></arg>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:40
+#: apt-key.8.xml:32
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -4732,21 +4612,26 @@ msgstr ""
 "claves se consideran de confianza."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:46
+#: apt-key.8.xml:38
 msgid "Commands"
 msgstr "Órdenes"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:48
-msgid "add <replaceable>filename</replaceable>"
-msgstr "add <replaceable>nombre-de-fichero</replaceable>"
+#: apt-key.8.xml:40
+msgid "add &synopsis-param-filename;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:44
+#, fuzzy
+#| msgid ""
+#| "Add a new key to the list of trusted keys.  The key is read from "
+#| "<replaceable>filename</replaceable>, or standard input if "
+#| "<replaceable>filename</replaceable> is <literal>-</literal>."
 msgid ""
-"Add a new key to the list of trusted keys.  The key is read from "
-"<replaceable>filename</replaceable>, or standard input if "
-"<replaceable>filename</replaceable> is <literal>-</literal>."
+"Add a new key to the list of trusted keys.  The key is read from &synopsis-"
+"param-filename;, or standard input if &synopsis-param-filename; is <literal>-"
+"</literal>."
 msgstr ""
 "Añade una nueva clave a la lista de claves de confianza. Puede introducir la "
 "clave mediante un fichero (<replaceable>nombre-de-fichero</replaceable>) o "
@@ -4754,64 +4639,66 @@ msgstr ""
 "<literal>-</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:60
-msgid "del <replaceable>keyid</replaceable>"
-msgstr "del <replaceable>identificador-de-la-clave</replaceable>"
+#: apt-key.8.xml:52
+msgid "del &synopsis-param-keyid;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:64
+#: apt-key.8.xml:56
 msgid "Remove a key from the list of trusted keys."
 msgstr "Elimina una clave de la lista de claves de confianza."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:71
-msgid "export <replaceable>keyid</replaceable>"
-msgstr "export <replaceable>identificador-de-la-clave</replaceable>"
+#: apt-key.8.xml:63
+msgid "export &synopsis-param-keyid;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:75
-msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+#: apt-key.8.xml:67
+#, fuzzy
+#| msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr ""
 "Devuelve la clave identificada por el <replaceable>identificador-de-la-"
 "clave</replaceable> por la salida estándar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:74
 msgid "exportall"
 msgstr "exportall"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:86
+#: apt-key.8.xml:78
 msgid "Output all trusted keys to standard output."
 msgstr "Devuelve todas las claves de confianza por la salida estándar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:85
 msgid "list"
 msgstr "list"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:97
+#: apt-key.8.xml:89
 msgid "List trusted keys."
 msgstr "Lista las claves de confianza."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:96
 msgid "finger"
 msgstr "finger"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:108
+#: apt-key.8.xml:100
 msgid "List fingerprints of trusted keys."
 msgstr "Lista las huellas digitales de las claves de confianza."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:107
 msgid "adv"
 msgstr "adv"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:119
+#: apt-key.8.xml:111
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -4820,7 +4707,7 @@ msgstr ""
 "«adv --recv-key»."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:131
+#: apt-key.8.xml:123
 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 "
@@ -4830,14 +4717,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:141
+#: apt-key.8.xml:133
 #, fuzzy
 #| msgid "update"
 msgid "net-update"
 msgstr "update"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:137
 msgid ""
 "Work similar to the <command>update</command> command above, but get the "
 "archive keyring from an URI instead and validate it against a master key.  "
@@ -4848,7 +4735,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:154
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -4857,12 +4744,20 @@ msgstr ""
 "descritas en el sección anterior."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:164
-msgid "--keyring <replaceable>filename</replaceable>"
-msgstr "--keyring <replaceable>nombre-de-fichero</replaceable>"
+#: apt-key.8.xml:156
+msgid "--keyring &synopsis-param-filename;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:165
+#: apt-key.8.xml:157
+#, fuzzy
+#| msgid ""
+#| "With this option it is possible to specify a specific keyring file the "
+#| "command should operate on. The default is that a command is executed on "
+#| "the <filename>trusted.gpg</filename> file as well as on all parts in the "
+#| "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
+#| "gpg</filename> is the primary keyring which means that e.g. new keys are "
+#| "added to this one."
 msgid ""
 "With this option it is possible to specify a specific keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -4879,44 +4774,44 @@ msgstr ""
 "esto es, por ejemplo, que las claves nuevas se añaden a este fichero."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:178
+#: apt-key.8.xml:170
 msgid "&file-trustedgpg;"
 msgstr "&file-trustedgpg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:180
+#: apt-key.8.xml:172
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:173
 msgid "Local trust database of archive keys."
 msgstr "Base de datos local de las claves de confianza de archivos Debian"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:184
+#: apt-key.8.xml:176
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:177
 msgid "Keyring of Debian archive trusted keys."
 msgstr "Registro de las claves de confianza del archivo de Debian."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:188
+#: apt-key.8.xml:180
 msgid ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:181
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr "Registro de las claves de confianza eliminadas del archivo de Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:198
+#: apt-key.8.xml:190
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
@@ -4944,34 +4839,8 @@ msgstr "apt-mark"
 msgid "mark/unmark a package as being automatically-installed"
 msgstr "Marca o desmarca un paquete como instalado automáticamente"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-mark.8.xml:39
-#, fuzzy
-#| msgid ""
-#| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
-#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
-#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
-msgid ""
-"  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
-"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
-"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> </group>"
-msgstr ""
-" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-"f=<replaceable>nombre-de-fichero</replaceable></option></arg> <group choice="
-"\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:39
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -4980,7 +4849,7 @@ msgstr ""
 "o no."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:61
+#: apt-mark.8.xml:43
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -4996,14 +4865,14 @@ msgstr ""
 "eliminará."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:51
 #, fuzzy
 #| msgid "markauto"
 msgid "auto"
 msgstr "markauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:52
 #, fuzzy
 #| msgid ""
 #| "<literal>markauto</literal> is used to mark a package as being "
@@ -5019,12 +4888,12 @@ msgstr ""
 "paquete instalado manualmente dependa de este paquete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:59
 msgid "manual"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:78
+#: apt-mark.8.xml:60
 #, fuzzy
 #| msgid ""
 #| "<literal>unmarkauto</literal> is used to mark a package as being manually "
@@ -5040,12 +4909,12 @@ msgstr ""
 "ningún otro depende de él."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:67
 msgid "hold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:68
 msgid ""
 "<literal>hold</literal> is used to mark a package as hold back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -5055,12 +4924,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:95
+#: apt-mark.8.xml:77
 msgid "unhold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:78
 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "
@@ -5073,12 +4942,12 @@ msgstr ""
 "instalados automáticamente, un paquete por línea."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:83
 msgid "showauto"
 msgstr "showauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:102
+#: apt-mark.8.xml:84
 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "
@@ -5093,14 +4962,14 @@ msgstr ""
 "instalados automáticamente, un paquete por línea."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:109
+#: apt-mark.8.xml:91
 #, fuzzy
 #| msgid "showauto"
 msgid "showmanual"
 msgstr "showauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:110
+#: apt-mark.8.xml:92
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -5108,14 +4977,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:116
+#: apt-mark.8.xml:98
 #, fuzzy
 #| msgid "showauto"
 msgid "showhold"
 msgstr "showauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:99
 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "
@@ -5128,7 +4997,7 @@ msgstr ""
 "instalados automáticamente, un paquete por línea."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:130
+#: apt-mark.8.xml:112
 msgid ""
 "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
@@ -5136,7 +5005,7 @@ msgstr ""
 "filename></option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:131
+#: apt-mark.8.xml:113
 msgid ""
 "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
 "option>"
@@ -5145,7 +5014,7 @@ msgstr ""
 "filename></option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:116
 msgid ""
 "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
 "filename> instead of the default location, which is "
@@ -5159,17 +5028,17 @@ msgstr ""
 "State</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:146
+#: apt-mark.8.xml:128
 msgid "  &file-extended_states;"
 msgstr "  &file-extended_states;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:151
+#: apt-mark.8.xml:133
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr "&apt-get;,&aptitude;,&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:155
+#: apt-mark.8.xml:137
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -5515,21 +5384,8 @@ msgstr "apt-sortpkgs"
 msgid "Utility to sort package index files"
 msgstr "Herramienta para ordenar los ficheros de índice de paquetes"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-sortpkgs.1.xml:39
-msgid ""
-"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-msgstr ""
-"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-"<arg><option>-o=<replaceable>cadena-de-configuración</replaceable></option></"
-"arg> <arg><option>-c=<replaceable>fichero</replaceable></option></arg> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>fichero</replaceable></arg>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:48
+#: apt-sortpkgs.1.xml:39
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (Source index or "
 "Package index) and sort the records so that they are ordered by the package "
@@ -5542,19 +5398,19 @@ msgstr ""
 "acuerdo a las reglas de ordenación internas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:54
+#: apt-sortpkgs.1.xml:45
 msgid "All output is sent to stdout, the input must be a seekable file."
 msgstr ""
 "Toda la salida se muestra por la salida estándar, la entrada debe ser un "
 "fichero ubicable."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:61
+#: apt-sortpkgs.1.xml:52
 msgid "<option>--source</option>"
 msgstr "<option>--source</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:63
+#: apt-sortpkgs.1.xml:54
 msgid ""
 "Use Source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -5563,7 +5419,7 @@ msgstr ""
 "SortPkgs::Source</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:77
+#: apt-sortpkgs.1.xml:68
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -6278,6 +6134,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:294
+#, fuzzy
+#| msgid ""
+#| "Two sub-options to limit the use of PDiffs are also available: With "
+#| "<literal>FileLimit</literal> can be specified how many PDiff files are "
+#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+#| "other hand is the maximum percentage of the size of all patches compared "
+#| "to the size of the targeted file. If one of these limits is exceeded the "
+#| "complete file is downloaded instead of the patches."
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: With "
 "<literal>FileLimit</literal> can be specified how many PDiff files are "
@@ -6343,7 +6207,7 @@ msgstr ""
 "forma predeterminada."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:321 sources.list.5.xml:155
+#: apt.conf.5.xml:321 sources.list.5.xml:160
 msgid "http"
 msgstr "http"
 
@@ -6504,7 +6368,7 @@ msgstr ""
 "corresponde a la opción por máquina."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:387 sources.list.5.xml:166
+#: apt.conf.5.xml:387 sources.list.5.xml:171
 msgid "ftp"
 msgstr "ftp"
 
@@ -6589,7 +6453,7 @@ msgstr ""
 "compatibles con la RFC 2428."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426 sources.list.5.xml:148
+#: apt.conf.5.xml:426 sources.list.5.xml:153
 msgid "cdrom"
 msgstr "cdrom"
 
@@ -9568,8 +9432,19 @@ msgid ""
 "will be downloaded."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:121
+msgid ""
+"<literal>trusted=yes</literal> can be set to indicate that packages from "
+"this source are always authenificated even if the <filename>Release</"
+"filename> file is not signed or the signature can't be checked. This "
+"disables parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context. <literal>trusted=no</literal> is the opposite which "
+"handles even correctly authenificated sources as not authenificated."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:123
+#: sources.list.5.xml:128
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -9582,12 +9457,12 @@ msgstr ""
 "seguidos por servidores de Internet distantes, por ejemplo)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:128
+#: sources.list.5.xml:133
 msgid "Some examples:"
 msgstr "Algunos ejemplos:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:135
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -9599,17 +9474,17 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:141
 msgid "URI specification"
 msgstr "Especificación de la URI"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:146
 msgid "file"
 msgstr "file"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:143
+#: sources.list.5.xml:148
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -9620,7 +9495,7 @@ msgstr ""
 "particiones montadas mediante NFS y réplicas o archivos de paquetes locales."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:150
+#: sources.list.5.xml:155
 msgid ""
 "The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -9630,7 +9505,7 @@ msgstr ""
 "list»."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:157
+#: sources.list.5.xml:162
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -9647,7 +9522,7 @@ msgstr ""
 "Tenga en cuenta que este método de autenticación no es seguro."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:173
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
@@ -9666,12 +9541,12 @@ msgstr ""
 "ignorarán proxies ftp definidos en el fichero de configuración que usen http."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:177
+#: sources.list.5.xml:182
 msgid "copy"
 msgstr "copy"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:179
+#: sources.list.5.xml:184
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -9682,17 +9557,17 @@ msgstr ""
 "Esto es útil para gente que use discos zip con APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
 msgid "rsh"
 msgstr "rsh"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
 msgid "ssh"
 msgstr "ssh"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:186
+#: sources.list.5.xml:191
 msgid ""
 "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
 "user and access the files. It is a good idea to do prior arrangements with "
@@ -9707,12 +9582,12 @@ msgstr ""
 "command> y <command>dd</command> para realizar la transferencia de ficheros."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:199
 msgid "more recognizable URI types"
 msgstr "Otros tipos de URI reconocidos."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:196
+#: sources.list.5.xml:201
 msgid ""
 "APT can be extended with more methods shipped in other optional packages "
 "which should follow the nameing scheme <literal>apt-transport-"
@@ -9733,7 +9608,7 @@ msgstr ""
 "filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:138
+#: sources.list.5.xml:143
 msgid ""
 "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
 "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -9742,7 +9617,7 @@ msgstr ""
 "<placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:215
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -9751,36 +9626,36 @@ msgstr ""
 "«stable/main», «stable/contrib», y «stable/non-free»."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:217
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:214
+#: sources.list.5.xml:219
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "Como arriba, excepto que usa la distribución «unstable» (en desarrollo)."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:220
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:222
 msgid "Source line for the above"
 msgstr "Línea para obtener el código fuente desde la ubicación anterior."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:223
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:225
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -9788,7 +9663,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:227
 #, fuzzy, no-wrap
 #| msgid ""
 #| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -9803,7 +9678,7 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:230
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -9812,13 +9687,13 @@ msgstr ""
 "sólo la sección «hamm/main»."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
+#: sources.list.5.xml:232
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:229
+#: sources.list.5.xml:234
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -9827,13 +9702,13 @@ msgstr ""
 "directorio «debian», y usa sólo la sección «&stable-codename;/contrib»."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:231
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:238
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -9846,20 +9721,20 @@ msgstr ""
 "filename>, se usará sólo una sesión FTP para ambas."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:246
+#: sources.list.5.xml:251
 #, fuzzy, no-wrap
 #| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:244
 #, fuzzy
 #| msgid ""
 #| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
@@ -9887,7 +9762,7 @@ msgstr ""
 "estructura.) <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:256
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
@@ -11412,6 +11287,261 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Ésto usará los archivos del disco previamente obtenidos."
 
+#, fuzzy
+#~| msgid ""
+#~| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
+#~| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
+#~| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> "
+#~| "<arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg "
+#~| "choice=\"plain\"><replaceable>regex</replaceable></arg></arg> <arg>show "
+#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
+#~| "arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
+#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~| "<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></"
+#~| "arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>xvcg <arg choice="
+#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~| "<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</"
+#~| "replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkgs</replaceable></arg></arg> </group>"
+#~ msgid ""
+#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
+#~ "arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> "
+#~ "<arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</"
+#~ "replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>depends <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~ "<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~ "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
+#~ "\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~ "<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
+#~ "group>"
+#~ msgstr ""
+#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
+#~ "<arg><option>-o=<replaceable>cadena-de-configuración</replaceable></"
+#~ "option></arg> <arg><option>-c=<replaceable>fichero</replaceable></"
+#~ "option></arg> <group choice=\"req\"> <arg>add <arg choice=\"plain\" rep="
+#~ "\"repeat\"><replaceable>fichero</replaceable></arg></arg> <arg>gencaches</"
+#~ "arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>paquete</replaceable></arg></arg> <arg>showsrc <arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable></arg></"
+#~ "arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</"
+#~ "arg> <arg>search <arg choice=\"plain\"><replaceable>exp_regular</"
+#~ "replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable></replaceable></arg></arg> <arg>depends <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable></arg></arg> "
+#~ "<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquete</"
+#~ "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
+#~ "\"><replaceable>prefijo</replaceable></arg></arg> <arg>dotty <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable></arg></arg> "
+#~ "<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquete</"
+#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>paquetes</replaceable></arg></arg> <arg>madison <arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>paquetes</replaceable></"
+#~ "arg></arg> </group>"
+
+#~ msgid ""
+#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
+#~ "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></"
+#~ "arg> <arg><option>-o=<replaceable>config string</replaceable></option></"
+#~ "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> "
+#~ "<group> <arg>add</arg> <arg>ident</arg> </group>"
+#~ msgstr ""
+#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
+#~ "<arg><option>-d=<replaceable>punto-de-montaje</replaceable></option></"
+#~ "arg> <arg><option>-o=<replaceable>cadena-de-configuración</replaceable></"
+#~ "option></arg> <arg><option>-c=<replaceable>fichero</replaceable></"
+#~ "option></arg> <group> <arg>add</arg> <arg>ident</arg> </group>"
+
+#~ msgid ""
+#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
+#~ msgstr ""
+#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-o=<replaceable>cadena-de-configuración</replaceable></"
+#~ "option></arg> <arg><option>-c=<replaceable>fichero</replaceable></"
+#~ "option></arg> <group choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </"
+#~ "group>"
+
+#~ msgid ""
+#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
+#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
+#~ "replaceable></arg>"
+#~ msgstr ""
+#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-t=<replaceable>directorio-temporal</replaceable></option></"
+#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>fichero</"
+#~ "replaceable></arg>"
+
+#~ msgid ""
+#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
+#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
+#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+#~ "arg> <arg><option>--arch <replaceable>architecture</replaceable></"
+#~ "option></arg> <arg><option>-o <replaceable>config</"
+#~ "replaceable>=<replaceable>string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
+#~ "replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#~ "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
+#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
+#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
+#~ "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
+#~ "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
+#~ "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
+#~ "group>"
+#~ msgstr ""
+#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
+#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
+#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+#~ "arg> <arg><option>--arch <replaceable>arquitectura</replaceable></"
+#~ "option></arg> <arg><option>-o <replaceable>configuración</"
+#~ "replaceable>=<replaceable>cadena</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>fichero</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>ruta</replaceable></arg><arg><replaceable>fichero-"
+#~ "alternativo</replaceable><arg><replaceable>prefijo-ruta</replaceable></"
+#~ "arg></arg></arg> <arg>sources<arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>ruta</replaceable></arg><arg><replaceable>fichero-"
+#~ "alternativo</replaceable><arg><replaceable>prefijo-ruta</replaceable></"
+#~ "arg></arg></arg> <arg>contents <arg choice=\"plain\"><replaceable>ruta</"
+#~ "replaceable></arg></arg> <arg>release <arg choice=\"plain"
+#~ "\"><replaceable>ruta</replaceable></arg></arg> <arg>generate <arg choice="
+#~ "\"plain\"><replaceable>fichero-configuración</replaceable></arg> <arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>sección</replaceable></arg></"
+#~ "arg> <arg>clean <arg choice=\"plain\"><replaceable>fichero-configuración</"
+#~ "replaceable></arg></arg> </group>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#~| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
+#~| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </"
+#~| "arg> <arg> <option>-t=</option> <arg choice='plain'> "
+#~| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
+#~| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
+#~| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
+#~| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
+#~| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
+#~| "<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </"
+#~| "arg> <arg choice='plain'> /<replaceable>target_release</replaceable> </"
+#~| "arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
+#~| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
+#~| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
+#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> "
+#~| "<arg> <group choice='req'> <arg choice='plain'> "
+#~| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+#~| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#~| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#~| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#~| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#~| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#~| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#~| "help</arg> </group> </arg> </group>"
+#~ msgid ""
+#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#~ "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
+#~ "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
+#~ "<arg> <option>-t=</option> <arg choice='plain'> "
+#~ "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
+#~ "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
+#~ "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
+#~ "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
+#~ "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
+#~ "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
+#~ "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#~ "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
+#~ "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
+#~ "<group choice='req'> <arg choice='plain'> "
+#~ "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+#~ "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~ "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#~ "help</arg> </group> </arg> </group>"
+#~ msgstr ""
+#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#~ "<option>-o= <replaceable>cadena-de-configuración</replaceable> </option> "
+#~ "</arg> <arg> <option>-c= <replaceable>fichero-de-configuración</"
+#~ "replaceable> </option> </arg> <arg> <option>-t=</option> <arg "
+#~ "choice='plain'> <replaceable>nombre-de-la-versión-objetivo</replaceable> "
+#~ "</arg> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> "
+#~ "<arg choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</"
+#~ "arg> <arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable> "
+#~ "<arg> <group choice='req'> <arg choice='plain'> =<replaceable>versión-del-"
+#~ "paquete</replaceable> </arg> <arg choice='plain'> /<replaceable>nombre-de-"
+#~ "la-versión-objetivo</replaceable> </arg> </group> </arg> </arg> </arg> "
+#~ "<arg choice='plain'>remove <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>paquete</replaceable></arg></arg> <arg "
+#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>paquete</replaceable></arg></arg> <arg "
+#~ "choice='plain'>source <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>paquete</replaceable> <arg> <group choice='req'> <arg "
+#~ "choice='plain'> =<replaceable>versión-del-paquete</replaceable> </arg> "
+#~ "<arg choice='plain'> /<replaceable>nombre-de-la-versión-objetivo</"
+#~ "replaceable> </arg> </group> </arg> </arg> </arg> <arg "
+#~ "choice='plain'>build-dep <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>paquete</replaceable></arg></arg> <arg "
+#~ "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#~ "help</arg> </group> </arg> </group>"
+
+#~ msgid ""
+#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+#~ "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
+#~ "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
+#~ "option></arg>"
+#~ msgstr ""
+#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>nombre-de-"
+#~ "fichero</replaceable></option></arg> <arg><replaceable>orden</"
+#~ "replaceable></arg> <arg rep=\"repeat\"><option><replaceable>argumentis</"
+#~ "replaceable></option></arg>"
+
+#~ msgid "add <replaceable>filename</replaceable>"
+#~ msgstr "add <replaceable>nombre-de-fichero</replaceable>"
+
+#~ msgid "del <replaceable>keyid</replaceable>"
+#~ msgstr "del <replaceable>identificador-de-la-clave</replaceable>"
+
+#~ msgid "export <replaceable>keyid</replaceable>"
+#~ msgstr "export <replaceable>identificador-de-la-clave</replaceable>"
+
 #~ msgid ""
 #~ "Update the local keyring with the keyring of Debian archive keys and "
 #~ "removes from the keyring the archive keys which are no longer valid."
@@ -11420,6 +11550,80 @@ msgstr "Ésto usará los archivos del disco previamente obtenidos."
 #~ "archivo Debian, y elimina del registro las claves del archivo que ya no "
 #~ "son válidas."
 
+#~ msgid "--keyring <replaceable>filename</replaceable>"
+#~ msgstr "--keyring <replaceable>nombre-de-fichero</replaceable>"
+
+#, fuzzy
+#~| msgid ""
+#~| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#~| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> "
+#~| "<group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> "
+#~| "<arg choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</"
+#~| "arg> </group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#~| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
+#~ msgid ""
+#~ "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
+#~ "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
+#~ "choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
+#~ "choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </"
+#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#~ "replaceable></arg> </arg> </group>"
+#~ msgstr ""
+#~ " <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-f=<replaceable>nombre-de-fichero</replaceable></option></"
+#~ "arg> <group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req"
+#~ "\"> <arg choice=\"plain\">markauto</arg> <arg choice=\"plain"
+#~ "\">unmarkauto</arg> </group> <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>paquete</replaceable></arg> </arg> <arg choice=\"plain"
+#~ "\">showauto</arg> </group>"
+
+#~ msgid ""
+#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
+#~ msgstr ""
+#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
+#~ "<arg><option>-o=<replaceable>cadena-de-configuración</replaceable></"
+#~ "option></arg> <arg><option>-c=<replaceable>fichero</replaceable></"
+#~ "option></arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>fichero</"
+#~ "replaceable></arg>"
+
+#, fuzzy
+#~| msgid ""
+#~| "Seconds the Release file should be considered valid after it was "
+#~| "created. The default is \"for ever\" (0) if the Release file of the "
+#~| "archive doesn't include a <literal>Valid-Until</literal> header.  If it "
+#~| "does then this date is the default. The date from the Release file or "
+#~| "the date specified by the creation time of the Release file "
+#~| "(<literal>Date</literal> header) plus the seconds specified with this "
+#~| "options are used to check if the validation of a file has expired by "
+#~| "using the earlier date of the two. Archive specific settings can be made "
+#~| "by appending the label of the archive to the option name."
+#~ msgid ""
+#~ "Seconds the Release file should be considered valid after it was created. "
+#~ "The default is \"for ever\" (0) if the Release file of the archive "
+#~ "doesn't include a <literal>Valid-Until</literal> header.  If it does then "
+#~ "this date is the default. The date from the Release file or the date "
+#~ "specified by the creation time of the Release file (<literal>Date</"
+#~ "literal> header) plus the seconds specified with this options are used to "
+#~ "check if the validation of a file has expired by using the earlier date "
+#~ "of the two. Archive specific settings can be made by appending the label "
+#~ "of the archive to the option name."
+#~ msgstr ""
+#~ "Los segundos que el fichero «Release» se considerará válido después de su "
+#~ "creación. El valor predeterminado es «para siempre» (cero) si el fichero "
+#~ "«Release» del archivo no incluye una cabecera <literal>Valid-Until</"
+#~ "literal>. Si lo incluye, el valor predeterminado es esta fecha. La fecha "
+#~ "del fichero «Release» o la fecha definida por la hora de creación del "
+#~ "fichero «Release» (cabecera <literal>Date</literal>), a lo que se añaden "
+#~ "los segundos definidos con estas opciones, se usan para comprobar si la "
+#~ "validez de un fichero a expirado, usando la fecha más antigua de las dos "
+#~ "anteriormente mencionadas. Se pueden definir opciones de configuración "
+#~ "específicas al archivo añadiendo la etiqueta del archivo al nombre de la "
+#~ "opción."
+
 #~ msgid "<option>--md5</option>"
 #~ msgstr "<option>--md5</option>"
 
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 9d012d4cd..b560f6c70 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2011-11-20 17:58+0100\n"
+"POT-Creation-Date: 2012-04-11 17:54+0300\n"
 "PO-Revision-Date: 2011-02-17 07:50+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -631,7 +631,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:210
+#: apt.ent:211
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -651,6 +651,101 @@ msgstr ""
 "     traduction est légèrement en retard sur le contenu d'origine.\n"
 "\">\n"
 
+#. type: Plain text
+#: apt.ent:214
+msgid ""
+"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
+"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:217
+msgid ""
+"<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+"synopsis-config-file \"config_file\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:220
+msgid ""
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
+"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"\"target_release\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:223
+msgid ""
+"<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+"synopsis-architecture \"architecture\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:226
+msgid ""
+"<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+"--> <!ENTITY synopsis-pkg \"pkg\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:229
+msgid ""
+"<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
+"ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:232
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+"pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:235
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+"awesome --> <!ENTITY synopsis-regex \"regex\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:238
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
+"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:241
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
+"apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+"\"temporary_directory\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:244
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+"synopsis-filename \"filename\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:250
+msgid ""
+"<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive "
+"packages path override pathprefix --> <!ENTITY synopsis-path \"path\"> <!"
+"ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section "
+"\"section\"> <!ENTITY synopsis-override \"override\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:253
+msgid ""
+"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+msgstr ""
+
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:16
@@ -686,59 +781,17 @@ msgstr "APT"
 msgid "query the APT cache"
 msgstr "recherche dans le cache d'APT"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cache.8.xml:39
-msgid ""
-"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
-"<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
-"arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></arg></"
-"arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>policy <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></"
-"arg> </group>"
-msgstr ""
-"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
-"o=<replaceable>option de configuration</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>fichier</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>paquet</replaceable></arg></arg> <arg>showsrc <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></"
-"arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
-"<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
-"arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</"
-"replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>paquet</replaceable></arg></arg> <arg>rdepends <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></arg> "
-"<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></arg></"
-"arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</"
-"replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>paquets</replaceable></arg></arg> <arg>madison <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>paquets</replaceable></arg></arg> </"
-"group>"
-
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
-#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121
-#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
-#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
+#: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38
+#: apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38
+#: apt-key.8.xml:30 apt-mark.8.xml:38 apt-secure.8.xml:43
+#: apt-sortpkgs.1.xml:38 apt.conf.5.xml:42 apt_preferences.5.xml:36
 #: sources.list.5.xml:36
 msgid "Description"
 msgstr "Description"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:65
+#: apt-cache.8.xml:39
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -751,7 +804,7 @@ msgstr ""
 "desquelles il extrait les informations intéressantes."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:70 apt-get.8.xml:127
+#: apt-cache.8.xml:44 apt-get.8.xml:44
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -760,12 +813,12 @@ msgstr ""
 "donnée, l'une des commandes suivantes doit être présente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:74
+#: apt-cache.8.xml:48
 msgid "gencaches"
 msgstr "gencaches"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:75
+#: apt-cache.8.xml:49
 msgid ""
 "<literal>gencaches</literal> performs the same operation as <command>apt-get "
 "check</command>. It builds the source and package caches from the sources in "
@@ -777,12 +830,12 @@ msgstr ""
 "lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:81
+#: apt-cache.8.xml:55
 msgid "showpkg <replaceable>pkg(s)</replaceable>"
 msgstr "showpkg <replaceable>paquet(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:82
+#: apt-cache.8.xml:56
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -806,7 +859,7 @@ msgstr ""
 "résultat :"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:94
+#: apt-cache.8.xml:68
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -832,7 +885,7 @@ msgstr ""
 "Reverse Provides: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:106
+#: apt-cache.8.xml:80
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -851,12 +904,12 @@ msgstr ""
 "consulter le code source d'APT."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:89
 msgid "stats"
 msgstr "stats"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:89
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -866,7 +919,7 @@ msgstr ""
 "rapportées :"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:118
+#: apt-cache.8.xml:92
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -875,7 +928,7 @@ msgstr ""
 "le cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:122
+#: apt-cache.8.xml:96
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -888,7 +941,7 @@ msgstr ""
 "dépendance. La majorité des paquets appartient à cette catégorie."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:128
+#: apt-cache.8.xml:102
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -906,7 +959,7 @@ msgstr ""
 "n'existe aucun paquet nommé « mail-transport-agent »."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:136
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -919,7 +972,7 @@ msgstr ""
 "le paquet « xless » remplit « X11-text-viewer »."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:142
+#: apt-cache.8.xml:116
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -932,7 +985,7 @@ msgstr ""
 "« debconf » est un paquet réel et il est aussi fourni par « debconf-tiny »."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:149
+#: apt-cache.8.xml:123
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -947,7 +1000,7 @@ msgstr ""
 "Habituellement on les trouve dans les champs « Conflicts » ou « Breaks »."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:130
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache; this value is therefore at least equal to the number of "
@@ -962,7 +1015,7 @@ msgstr ""
 "considérablement plus grande que le nombre total de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:163
+#: apt-cache.8.xml:137
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -971,12 +1024,12 @@ msgstr ""
 "dépendances déclarées par tous les paquets présents dans le cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:170
+#: apt-cache.8.xml:144
 msgid "showsrc <replaceable>pkg(s)</replaceable>"
 msgstr "showsrc <replaceable>paquet(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -987,12 +1040,12 @@ msgstr ""
 "les entrées qui déclarent que ces noms correspondent à des paquets binaires."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:176 apt-config.8.xml:87
+#: apt-cache.8.xml:150 apt-config.8.xml:75
 msgid "dump"
 msgstr "dump"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:151
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -1001,12 +1054,12 @@ msgstr ""
 "paquet du cache. Elle est d'abord destinée au débogage."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:181
+#: apt-cache.8.xml:155
 msgid "dumpavail"
 msgstr "dumpavail"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:156
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
@@ -1016,12 +1069,12 @@ msgstr ""
 "et la méthode &dselect; s'en sert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:186
+#: apt-cache.8.xml:160
 msgid "unmet"
 msgstr "unmet"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:161
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -1030,12 +1083,12 @@ msgstr ""
 "dépendances absentes dans le cache de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml:165
 msgid "show <replaceable>pkg(s)</replaceable>"
 msgstr "show <replaceable>paquet(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -1045,12 +1098,12 @@ msgstr ""
 "argument."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:171
 msgid "search <replaceable>regex [ regex ... ]</replaceable>"
 msgstr "search <replaceable>expression [ expression ... ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:172
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see "
@@ -1073,7 +1126,7 @@ msgstr ""
 "seulement dans les noms de paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:211
+#: apt-cache.8.xml:185
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -1082,12 +1135,12 @@ msgstr ""
 "rationnelles différentes sur lesquelles seront réalisées un « et » logique."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:215
+#: apt-cache.8.xml:189
 msgid "depends <replaceable>pkg(s)</replaceable>"
 msgstr "depends <replaceable>paquet(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:216
+#: apt-cache.8.xml:190
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -1097,12 +1150,12 @@ msgstr ""
 "satisfont ces dépendances."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:220
+#: apt-cache.8.xml:194
 msgid "rdepends <replaceable>pkg(s)</replaceable>"
 msgstr "rdepends <replaceable>paquet(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:195
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -1111,12 +1164,12 @@ msgstr ""
 "dépendances inverses d'un paquet."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:225
+#: apt-cache.8.xml:199
 msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
 msgstr "pkgnames <replaceable>[ préfixe ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml:200
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -1131,7 +1184,7 @@ msgstr ""
 "l'option <option>--generate</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:205
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -1142,12 +1195,12 @@ msgstr ""
 "affichés dans la liste créée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:236
+#: apt-cache.8.xml:210
 msgid "dotty <replaceable>pkg(s)</replaceable>"
 msgstr "dotty <replaceable>paquet(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:237
+#: apt-cache.8.xml:211
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1169,7 +1222,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:246
+#: apt-cache.8.xml:220
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -1184,19 +1237,19 @@ msgstr ""
 "conflits."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:251
+#: apt-cache.8.xml:225
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 "Attention, dotty ne peut pas représenter des ensembles très grands de "
 "paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
+#: apt-cache.8.xml:228
 msgid "xvcg <replaceable>pkg(s)</replaceable>"
 msgstr "xvcg <replaceable>paquet(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:229
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -1206,12 +1259,12 @@ msgstr ""
 "ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:259
+#: apt-cache.8.xml:233
 msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
 msgstr "policy <replaceable>[ paquet(s) ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:260
+#: apt-cache.8.xml:234
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -1224,12 +1277,12 @@ msgstr ""
 "paquet donné en argument."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:266
+#: apt-cache.8.xml:240
 msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
 msgstr "madison <replaceable>[ paquet(s) ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:267
+#: apt-cache.8.xml:241
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -1249,24 +1302,24 @@ msgstr ""
 "literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126
-#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
+#: apt-cache.8.xml:252 apt-config.8.xml:84 apt-extracttemplates.1.xml:51
+#: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
+#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:577 apt.conf.5.xml:599
 msgid "options"
 msgstr "options"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:256
 msgid "<option>-p</option>"
 msgstr "<option>-p</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:256
 msgid "<option>--pkg-cache</option>"
 msgstr "<option>--pkg-cache</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:283
+#: apt-cache.8.xml:257
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -1277,18 +1330,18 @@ msgstr ""
 "<literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404
-#: apt-sortpkgs.1.xml:61
+#: apt-cache.8.xml:262 apt-ftparchive.1.xml:551 apt-get.8.xml:321
+#: apt-sortpkgs.1.xml:52
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
+#: apt-cache.8.xml:262
 msgid "<option>--src-cache</option>"
 msgstr "<option>--src-cache</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:263
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1304,17 +1357,17 @@ msgstr ""
 "<literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
+#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
+#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:271
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1329,17 +1382,17 @@ msgstr ""
 "<literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:277
 msgid "<option>-i</option>"
 msgstr "<option>-i</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:277
 msgid "<option>--important</option>"
 msgstr "<option>--important</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:304
+#: apt-cache.8.xml:278
 msgid ""
 "Print only important dependencies; for use with unmet and depends. Causes "
 "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
@@ -1350,47 +1403,47 @@ msgstr ""
 "Élément de configuration : <literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
+#: apt-cache.8.xml:283
 msgid "<option>--no-pre-depends</option>"
 msgstr "<option>--no-pre-depends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:284
 msgid "<option>--no-depends</option>"
 msgstr "<option>--no-depends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:285
 msgid "<option>--no-recommends</option>"
 msgstr "<option>--no-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:286
 msgid "<option>--no-suggests</option>"
 msgstr "<option>--no-suggests</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:287
 msgid "<option>--no-conflicts</option>"
 msgstr "<option>--no-conflicts</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:314
+#: apt-cache.8.xml:288
 msgid "<option>--no-breaks</option>"
 msgstr "<option>--no-breaks</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315
+#: apt-cache.8.xml:289
 msgid "<option>--no-replaces</option>"
 msgstr "<option>--no-replaces</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:290
 msgid "<option>--no-enhances</option>"
 msgstr "<option>--no-enhances</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:291
 #, fuzzy
 #| msgid ""
 #| "Per default the <literal>depends</literal> and <literal>rdepends</"
@@ -1412,17 +1465,17 @@ msgstr ""
 "replaceable></literal>, p. ex. <literal>APT::Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
+#: apt-cache.8.xml:297 apt-cdrom.8.xml:111 apt-get.8.xml:278
 msgid "<option>-f</option>"
 msgstr "<option>-f</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323
+#: apt-cache.8.xml:297
 msgid "<option>--full</option>"
 msgstr "<option>--full</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:324
+#: apt-cache.8.xml:298
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -1432,18 +1485,18 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
-#: apt-get.8.xml:447
+#: apt-cache.8.xml:302 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563
+#: apt-get.8.xml:369
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:302
 msgid "<option>--all-versions</option>"
 msgstr "<option>--all-versions</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:303
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -1461,17 +1514,17 @@ msgstr ""
 "<literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:311
 msgid "<option>-g</option>"
 msgstr "<option>-g</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:311
 msgid "<option>--generate</option>"
 msgstr "<option>--generate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:312
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1483,17 +1536,17 @@ msgstr ""
 "configuration : <literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:317
 msgid "<option>--names-only</option>"
 msgstr "<option>--names-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343 apt-cdrom.8.xml:142
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:129
 msgid "<option>-n</option>"
 msgstr "<option>-n</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:318
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1503,12 +1556,12 @@ msgstr ""
 "NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:348
+#: apt-cache.8.xml:322
 msgid "<option>--all-names</option>"
 msgstr "<option>--all-names</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:323
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -1519,12 +1572,12 @@ msgstr ""
 "configuration : <literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:354
+#: apt-cache.8.xml:328
 msgid "<option>--recurse</option>"
 msgstr "<option>--recurse</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:355
+#: apt-cache.8.xml:329
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1536,12 +1589,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:360
+#: apt-cache.8.xml:334
 msgid "<option>--installed</option>"
 msgstr "<option>--installed</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:362
+#: apt-cache.8.xml:336
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -1552,46 +1605,46 @@ msgstr ""
 "Élément de configuration : <literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:591
-#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89
+#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513
+#: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:596 apt-key.8.xml:175 apt-mark.8.xml:144
+#: apt-cache.8.xml:346 apt-get.8.xml:518 apt-key.8.xml:167 apt-mark.8.xml:126
 #: apt.conf.5.xml:1110 apt_preferences.5.xml:697
 msgid "Files"
 msgstr "Fichiers"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:348
 msgid "&file-sourceslist; &file-statelists;"
 msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:606
-#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704
-#: sources.list.5.xml:250
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94
+#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528
+#: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704
+#: sources.list.5.xml:255
 msgid "See Also"
 msgstr "Voir aussi"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:380
+#: apt-cache.8.xml:354
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:612
-#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99
+#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534
+#: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr "Diagnostics"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:385
+#: apt-cache.8.xml:359
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1618,23 +1671,8 @@ msgstr "apt-cdrom"
 msgid "APT CDROM management utility"
 msgstr "Utilitaire de gestion des CD d'APT"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cdrom.8.xml:38
-msgid ""
-"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
-"<arg>add</arg> <arg>ident</arg> </group>"
-msgstr ""
-"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>point de montage du CD</replaceable></option></"
-"arg> <arg><option>-o=<replaceable>option de configuration</replaceable></"
-"option></arg> <arg><option>-c=<replaceable>fichier</replaceable></option></"
-"arg> <group> <arg>add</arg> <arg>ident</arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
+#: apt-cdrom.8.xml:38
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -1647,7 +1685,7 @@ msgstr ""
 "gravure et de vérifier les fichiers d'index."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:45
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
@@ -1659,12 +1697,12 @@ msgstr ""
 "pour prendre en compte de possibles erreurs de gravure."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:68
+#: apt-cdrom.8.xml:55
 msgid "add"
 msgstr "add"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:69
+#: apt-cdrom.8.xml:56
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@ -1679,7 +1717,7 @@ msgstr ""
 "titre descriptif est demandé."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:77
+#: apt-cdrom.8.xml:64
 msgid ""
 "APT uses a CDROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -1690,12 +1728,12 @@ msgstr ""
 "identifiants dans <filename>&statedir;/cdroms.list</filename>."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:84
+#: apt-cdrom.8.xml:71
 msgid "ident"
 msgstr "ident"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:85
+#: apt-cdrom.8.xml:72
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -1704,7 +1742,7 @@ msgstr ""
 "le nom du fichier stocké."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:64
+#: apt-cdrom.8.xml:51
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present.  <placeholder type=\"variablelist"
@@ -1715,22 +1753,22 @@ msgstr ""
 "\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:161
+#: apt-cdrom.8.xml:81 apt-key.8.xml:153
 msgid "Options"
 msgstr "Options"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
+#: apt-cdrom.8.xml:85 apt-ftparchive.1.xml:519 apt-get.8.xml:273
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98
+#: apt-cdrom.8.xml:85
 msgid "<option>--cdrom</option>"
 msgstr "<option>--cdrom</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:99
+#: apt-cdrom.8.xml:86
 msgid ""
 "Mount point; specify the location to mount the cdrom. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -1742,17 +1780,17 @@ msgstr ""
 "mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
+#: apt-cdrom.8.xml:94
 msgid "<option>-r</option>"
 msgstr "<option>-r</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
+#: apt-cdrom.8.xml:94
 msgid "<option>--rename</option>"
 msgstr "<option>--rename</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:108
+#: apt-cdrom.8.xml:95
 msgid ""
 "Rename a disc; change the label of a disk or override the disks given label. "
 "This option will cause <command>apt-cdrom</command> to prompt for a new "
@@ -1764,17 +1802,17 @@ msgstr ""
 "<literal>APT::CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116 apt-get.8.xml:375
+#: apt-cdrom.8.xml:103 apt-get.8.xml:292
 msgid "<option>-m</option>"
 msgstr "<option>-m</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116
+#: apt-cdrom.8.xml:103
 msgid "<option>--no-mount</option>"
 msgstr "<option>--no-mount</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:117
+#: apt-cdrom.8.xml:104
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -1785,12 +1823,12 @@ msgstr ""
 "NoMount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:124
+#: apt-cdrom.8.xml:111
 msgid "<option>--fast</option>"
 msgstr "<option>--fast</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:125
+#: apt-cdrom.8.xml:112
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1804,12 +1842,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:134
+#: apt-cdrom.8.xml:121
 msgid "<option>--thorough</option>"
 msgstr "<option>--thorough</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:135
+#: apt-cdrom.8.xml:122
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1821,22 +1859,22 @@ msgstr ""
 "le CD mais tous les paquets seront repérés."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:143 apt-get.8.xml:406
+#: apt-cdrom.8.xml:130 apt-get.8.xml:323
 msgid "<option>--just-print</option>"
 msgstr "<option>--just-print</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:144 apt-get.8.xml:408
+#: apt-cdrom.8.xml:131 apt-get.8.xml:325
 msgid "<option>--recon</option>"
 msgstr "<option>--recon</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:145 apt-get.8.xml:409
+#: apt-cdrom.8.xml:132 apt-get.8.xml:326
 msgid "<option>--no-act</option>"
 msgstr "<option>--no-act</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:133
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -1847,12 +1885,12 @@ msgstr ""
 "<literal>APT::CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:159
+#: apt-cdrom.8.xml:146
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:164
+#: apt-cdrom.8.xml:151
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1881,21 +1919,8 @@ msgstr "apt-config"
 msgid "APT Configuration Query program"
 msgstr "Programme d'interrogation de la configuration d'APT"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-config.8.xml:39
-msgid ""
-"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>shell</arg> <arg>dump</arg> </group>"
-msgstr ""
-"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
-"o=<replaceable>option de configuration</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>fichier</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:51
+#: apt-config.8.xml:39
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -1909,7 +1934,7 @@ msgstr ""
 "apt.conf</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:56 apt-ftparchive.1.xml:75
+#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present."
@@ -1918,12 +1943,12 @@ msgstr ""
 "donnée, l'une des commandes suivantes doit être présente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:49
 msgid "shell"
 msgstr "shell"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:63
+#: apt-config.8.xml:51
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
@@ -1939,7 +1964,7 @@ msgstr ""
 "cette commande devrait être utilisée comme suit :"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:71
+#: apt-config.8.xml:59
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -1951,7 +1976,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:76
+#: apt-config.8.xml:64
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -1960,7 +1985,7 @@ msgstr ""
 "MyApp::Options ou, par défaut, la valeur -f."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:80
+#: apt-config.8.xml:68
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -1972,18 +1997,18 @@ msgstr ""
 "vérifiée."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:89
+#: apt-config.8.xml:77
 msgid "Just show the contents of the configuration space."
 msgstr "Affiche seulement le contenu de l'espace de configuration."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
-#: apt-sortpkgs.1.xml:73
+#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112
+#: apt-config.8.xml:100
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2008,21 +2033,8 @@ msgstr ""
 "Outil d'extraction des textes et fichiers de configuration pour DebConf "
 "contenu dans un paquet Debian"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-extracttemplates.1.xml:39
-msgid ""
-"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-"<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
-"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
-"arg>"
-msgstr ""
-"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-"<arg><option>-t=<replaceable>répertoire temporaire</replaceable></option></"
-"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>fichier</"
-"replaceable></arg>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:39
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -2037,12 +2049,12 @@ msgstr ""
 "suivant :"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:52
+#: apt-extracttemplates.1.xml:44
 msgid "package version template-file config-script"
 msgstr "paquet version guide-de-configuration script-de-configuration"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:53
+#: apt-extracttemplates.1.xml:45
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
@@ -2056,17 +2068,17 @@ msgstr ""
 "<filename>package.config.XXXX</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63 apt-get.8.xml:525
+#: apt-extracttemplates.1.xml:55 apt-get.8.xml:447
 msgid "<option>-t</option>"
 msgstr "<option>-t</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63
+#: apt-extracttemplates.1.xml:55
 msgid "<option>--tempdir</option>"
 msgstr "<option>--tempdir</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:65
+#: apt-extracttemplates.1.xml:57
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@ -2077,7 +2089,7 @@ msgstr ""
 "ExtractTemplates::TempDir</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:82
+#: apt-extracttemplates.1.xml:74
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -2105,51 +2117,8 @@ msgstr "apt-ftparchive"
 msgid "Utility to generate index files"
 msgstr "Outil de création de fichiers d'index"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-ftparchive.1.xml:39
-msgid ""
-"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
-"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
-"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
-"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-"replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
-"arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
-"arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
-"replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
-"\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
-msgstr ""
-"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg><arg> "
-"<option>--md5</option></arg><arg> <option>--delink</option></arg> "
-"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
-"arg> <arg><option>-o <replaceable>option de configuration</"
-"replaceable>=<replaceable>chaîne</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>fichier</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>packages<arg choice=\"plain\" rep=\"repeat\"><replaceable>chemin</"
-"replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>préfixe-de-chemin</replaceable></arg></arg></"
-"arg> <arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>chemin</"
-"replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>préfixe-de-chemin</replaceable></arg></arg></"
-"arg> <arg>contents <arg choice=\"plain\"><replaceable>chemin</replaceable></"
-"arg></arg> <arg>release <arg choice=\"plain\"><replaceable>chemin</"
-"replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-"\"><replaceable>fichier-de-configuration</replaceable></arg><arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>section</replaceable></arg></arg> "
-"<arg>clean <arg choice=\"plain\"><replaceable>fichier-de-configuration</"
-"replaceable></arg></arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -2161,7 +2130,7 @@ msgstr ""
 "index doit être créé pour un site et basé sur le contenu de ce site."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:64
+#: apt-ftparchive.1.xml:43
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -2176,7 +2145,7 @@ msgstr ""
 "élaborée pour automatiser le processus de création d'une archive complète."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:70
+#: apt-ftparchive.1.xml:49
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -2191,12 +2160,12 @@ msgstr ""
 "voulus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:79
+#: apt-ftparchive.1.xml:58
 msgid "packages"
 msgstr "packages"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:81
+#: apt-ftparchive.1.xml:60
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -2210,7 +2179,7 @@ msgstr ""
 "équivalente à &dpkg-scanpackages;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
+#: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
@@ -2218,12 +2187,12 @@ msgstr ""
 "binaire."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:89
+#: apt-ftparchive.1.xml:68
 msgid "sources"
 msgstr "sources"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:70
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -2237,7 +2206,7 @@ msgstr ""
 "équivalente à &dpkg-scansources;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:75
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -2248,12 +2217,12 @@ msgstr ""
 "override pour changer de fichier source d'« override »."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:101
+#: apt-ftparchive.1.xml:80
 msgid "contents"
 msgstr "contents"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:103
+#: apt-ftparchive.1.xml:82
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -2271,12 +2240,12 @@ msgstr ""
 "virgule sépare les paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:113
+#: apt-ftparchive.1.xml:92
 msgid "release"
 msgstr "release"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:115
+#: apt-ftparchive.1.xml:94
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -2302,7 +2271,7 @@ msgstr ""
 "SHA1 et SHA256 pour chaque fichier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:125
+#: apt-ftparchive.1.xml:104
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -2323,12 +2292,12 @@ msgstr ""
 "<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:115
 msgid "generate"
 msgstr "generate"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:138
+#: apt-ftparchive.1.xml:117
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -2342,12 +2311,12 @@ msgstr ""
 "préciser index et répertoires aussi bien que les paramètres requis."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
+#: apt-ftparchive.1.xml:124 apt-get.8.xml:215
 msgid "clean"
 msgstr "clean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:126
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -2357,12 +2326,12 @@ msgstr ""
 "sont plus nécessaires."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:153
+#: apt-ftparchive.1.xml:132
 msgid "The Generate Configuration"
 msgstr "Configuration de la commande generate"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:134
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -2379,19 +2348,19 @@ msgstr ""
 "arborescence. Cela n'affecte que l'usage de l'étiquette de visée (scope tag)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:163
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
 "Ce fichier de configuration possède quatre sections, décrites ci-dessous."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:144
 msgid "Dir Section"
 msgstr "La section Dir"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:146
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -2404,12 +2373,12 @@ msgstr ""
 "manière à produire un chemin absolu et complet."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:151
 msgid "ArchiveDir"
 msgstr "ArchiveDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:153
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2420,32 +2389,32 @@ msgstr ""
 "filename> et les noeuds des distributions."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:179
+#: apt-ftparchive.1.xml:158
 msgid "OverrideDir"
 msgstr "OverrideDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:160
 msgid "Specifies the location of the override files."
 msgstr "Indique l'emplacement des fichiers d'« override »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:184
+#: apt-ftparchive.1.xml:163
 msgid "CacheDir"
 msgstr "CacheDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:165
 msgid "Specifies the location of the cache files"
 msgstr "Indique l'emplacement des fichiers de cache."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:189
+#: apt-ftparchive.1.xml:168
 msgid "FileListDir"
 msgstr "FileListDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:170
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -2454,12 +2423,12 @@ msgstr ""
 "sert de la valeur <literal>FileList</literal> définie plus bas)."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:176
 msgid "Default Section"
 msgstr "La section Default"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:199
+#: apt-ftparchive.1.xml:178
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -2470,12 +2439,12 @@ msgstr ""
 "annulées dans d'autres sections (paramètrage par section)."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
+#: apt-ftparchive.1.xml:182
 msgid "Packages::Compress"
 msgstr "Packages::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:184
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -2488,12 +2457,12 @@ msgstr ""
 "Par défaut, c'est la chaîne « . gzip »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:190
 msgid "Packages::Extensions"
 msgstr "Packages::Extensions"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:213
+#: apt-ftparchive.1.xml:192
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -2502,12 +2471,12 @@ msgstr ""
 "paquets. Par défaut, c'est « .deb »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:196
 msgid "Sources::Compress"
 msgstr "Sources::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:219
+#: apt-ftparchive.1.xml:198
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -2516,12 +2485,12 @@ msgstr ""
 "compressés les fichiers sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:202
 msgid "Sources::Extensions"
 msgstr "Sources::Extensions"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:225
+#: apt-ftparchive.1.xml:204
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -2530,12 +2499,12 @@ msgstr ""
 "fichiers sources. Par défaut, c'est « .dsc »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:208
 msgid "Contents::Compress"
 msgstr "Contents::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:210
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -2544,12 +2513,12 @@ msgstr ""
 "compressés les fichiers « Contents »."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:214
 msgid "Translation::Compress"
 msgstr "Translation::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:237
+#: apt-ftparchive.1.xml:216
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
@@ -2558,12 +2527,12 @@ msgstr ""
 "compressé le fichier maître Translations-en."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
+#: apt-ftparchive.1.xml:220
 msgid "DeLinkLimit"
 msgstr "DeLinkLimit"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:222
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -2574,12 +2543,12 @@ msgstr ""
 "paramètre <literal>External-Links</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248
+#: apt-ftparchive.1.xml:227
 msgid "FileMode"
 msgstr "FileMode"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:229
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
@@ -2589,12 +2558,12 @@ msgstr ""
 "utilisateur (umasq) est ignoré."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
+#: apt-ftparchive.1.xml:234 apt-ftparchive.1.xml:380
 msgid "LongDescription"
 msgstr "LongDescription"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+#: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
@@ -2603,12 +2572,12 @@ msgstr ""
 "Packages ou déplacées dans un fichier maître Translation-en."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:263
+#: apt-ftparchive.1.xml:242
 msgid "TreeDefault Section"
 msgstr "La section TreeDefault"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml:244
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -2620,12 +2589,12 @@ msgstr ""
 "respective."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:249
 msgid "MaxContentsChange"
 msgstr "MaxContentsChange"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:272
+#: apt-ftparchive.1.xml:251
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -2636,12 +2605,12 @@ msgstr ""
 "robin » de manière que, sur plusieurs jours, tous soient reconstruits."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:256
 msgid "ContentsAge"
 msgstr "ContentsAge"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:279
+#: apt-ftparchive.1.xml:258
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -2659,12 +2628,12 @@ msgstr ""
 "défaut ce nombre vaut 10, l'unité étant le jour."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:267
 msgid "Directory"
 msgstr "Directory"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:290
+#: apt-ftparchive.1.xml:269
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -2673,12 +2642,12 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:273
 msgid "SrcDirectory"
 msgstr "SrcDirectory"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:296
+#: apt-ftparchive.1.xml:275
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -2687,12 +2656,12 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/source/</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:418
 msgid "Packages"
 msgstr "Packages"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:281
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -2701,12 +2670,12 @@ msgstr ""
 "$(SECTION)/binary-$(ARCH)/Packages</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:306 apt-ftparchive.1.xml:444
+#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:423
 msgid "Sources"
 msgstr "Sources"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:287
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -2715,12 +2684,12 @@ msgstr ""
 "$(SECTION)/source/Sources</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
+#: apt-ftparchive.1.xml:291
 msgid "Translation"
 msgstr "Translation"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:293
 msgid ""
 "Set the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
@@ -2731,12 +2700,12 @@ msgstr ""
 "défaut : <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319
+#: apt-ftparchive.1.xml:298
 msgid "InternalPrefix"
 msgstr "InternalPrefix"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:300
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -2747,12 +2716,12 @@ msgstr ""
 "défaut, c'est <filename>$(DIST)/$(SECTION)/</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:305 apt-ftparchive.1.xml:429
 msgid "Contents"
 msgstr "Contents"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:307
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
@@ -2765,22 +2734,22 @@ msgstr ""
 "<command>apt-ftparchive</command> les intègre automatiquement."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:314
 msgid "Contents::Header"
 msgstr "Contents::Header"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:316
 msgid "Sets header file to prepend to the contents output."
 msgstr "Indique l'en-tête à préfixer au fichier « Contents » créé."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:340 apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:454
 msgid "BinCacheDB"
 msgstr "BinCacheDB"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:342
+#: apt-ftparchive.1.xml:321
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -2789,12 +2758,12 @@ msgstr ""
 "Différentes sections peuvent partager cette base de données."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:325
 msgid "FileList"
 msgstr "FileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:327
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -2805,12 +2774,12 @@ msgstr ""
 "relatifs sont préfixés par le répertoire de l'archive."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:353
+#: apt-ftparchive.1.xml:332
 msgid "SourceFileList"
 msgstr "SourceFileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:355
+#: apt-ftparchive.1.xml:334
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -2823,12 +2792,12 @@ msgstr ""
 "traiter les index de sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:342
 msgid "Tree Section"
 msgstr "La section Tree"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:365
+#: apt-ftparchive.1.xml:344
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -2842,7 +2811,7 @@ msgstr ""
 "par la variable de substitution <literal>Directory</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:349
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -2855,7 +2824,7 @@ msgstr ""
 "C'est par exemple : <filename>dists/&stable-codename;</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:375
+#: apt-ftparchive.1.xml:354
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
@@ -2866,7 +2835,7 @@ msgstr ""
 "trois nouvelles variables suivantes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:381
+#: apt-ftparchive.1.xml:360
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -2880,7 +2849,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:378
+#: apt-ftparchive.1.xml:357
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -2891,12 +2860,12 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
+#: apt-ftparchive.1.xml:366
 msgid "Sections"
 msgstr "Sections"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389
+#: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"
@@ -2907,12 +2876,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
+#: apt-ftparchive.1.xml:373 apt.conf.5.xml:157
 msgid "Architectures"
 msgstr "Architectures"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:375
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -2923,12 +2892,12 @@ msgstr ""
 "que l'arborescence est une arborescence de sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:434
 msgid "BinOverride"
 msgstr "BinOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:388
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -2937,12 +2906,12 @@ msgstr ""
 "informations sur la section, la priorité et le responsable du paquet."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:439
 msgid "SrcOverride"
 msgstr "SrcOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:415
+#: apt-ftparchive.1.xml:394
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -2951,32 +2920,32 @@ msgstr ""
 "informations sur la section."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
+#: apt-ftparchive.1.xml:398 apt-ftparchive.1.xml:444
 msgid "ExtraOverride"
 msgstr "ExtraOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
 msgid "Sets the binary extra override file."
 msgstr "Indique un autre fichier d'« override » pour les binaires."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:424 apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:403 apt-ftparchive.1.xml:449
 msgid "SrcExtraOverride"
 msgstr "SrcExtraOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
+#: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
 msgid "Sets the source extra override file."
 msgstr "Indique un autre fichier d'« override » pour les sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:431
+#: apt-ftparchive.1.xml:410
 msgid "BinDirectory Section"
 msgstr "La section BinDirectory"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:412
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -2991,12 +2960,12 @@ msgstr ""
 "paramètrage de <literal>Section</literal><literal>Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:441
+#: apt-ftparchive.1.xml:420
 msgid "Sets the Packages file output."
 msgstr "Définit le fichier « Packages » créé."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:446
+#: apt-ftparchive.1.xml:425
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -3005,52 +2974,52 @@ msgstr ""
 "<literal>Packages</literal> ou <literal>Sources</literal> est nécessaire."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml:431
 msgid "Sets the Contents file output. (optional)"
 msgstr "Définit le fichier « Contents » créé."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:457
+#: apt-ftparchive.1.xml:436
 msgid "Sets the binary override file."
 msgstr "Définit le fichier d'« override » pour les binaires."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:441
 msgid "Sets the source override file."
 msgstr "Définit le fichier d'« override » pour les sources."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:477
+#: apt-ftparchive.1.xml:456
 msgid "Sets the cache DB."
 msgstr "Définit la base de données cache."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:459
 msgid "PathPrefix"
 msgstr "PathPrefix"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:461
 msgid "Appends a path to all the output paths."
 msgstr "Ajoute un chemin à tous les chemins créés."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:464
 msgid "FileList, SourceFileList"
 msgstr "FileList, SourceFileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:466
 msgid "Specifies the file list file."
 msgstr "Définit le fichier contenant la liste des fichiers."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:473
 msgid "The Binary Override File"
 msgstr "Le fichier d'« Override » pour les binaires."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:495
+#: apt-ftparchive.1.xml:474
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -3065,19 +3034,19 @@ msgstr ""
 "nom du responsable de paquet."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:480
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:482
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:500
+#: apt-ftparchive.1.xml:479
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3094,12 +3063,12 @@ msgstr ""
 "deuxième forme remplace inconditionnellement le champ."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:490
 msgid "The Source Override File"
 msgstr "Le fichier d'« Override » pour les sources"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:513
+#: apt-ftparchive.1.xml:492
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -3110,12 +3079,12 @@ msgstr ""
 "sa section."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:497
 msgid "The Extra Override File"
 msgstr "Le fichier supplémentaire d'« Override »"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:520
+#: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -3127,13 +3096,23 @@ msgstr ""
 "ligne est la nouvelle valeur."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:508
 msgid ""
 "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml:510
+#, fuzzy
+#| msgid ""
+#| "Values for the additional metadata fields in the Release file are taken "
+#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
+#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
+#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
+#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
+#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-"
+#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</"
+#| "literal>, <literal>Description</literal>."
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -3145,14 +3124,22 @@ msgid ""
 "literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
 "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
 msgstr ""
+"La valeur des autres champs de métadonnées du fichier Release sont tirées de "
+"la valeur correspondante dans <literal>APT::FTPArchive::Release</literal>, "
+"p. ex. <literal>APT::FTPArchive::Release::Origin</literal>.  Les champs "
+"reconnus sont : <literal>Origin</literal>, <literal>Label</literal>, "
+"<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</"
+"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:540
+#: apt-ftparchive.1.xml:519
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:521
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3162,7 +3149,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:548
+#: apt-ftparchive.1.xml:527
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3177,12 +3164,12 @@ msgstr ""
 "configuration : <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:554
+#: apt-ftparchive.1.xml:533
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:556
+#: apt-ftparchive.1.xml:535
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3196,12 +3183,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:562
+#: apt-ftparchive.1.xml:541
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:564
+#: apt-ftparchive.1.xml:543
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3217,12 +3204,12 @@ msgstr ""
 "de configuration : <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:572
+#: apt-ftparchive.1.xml:551
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:553
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3233,12 +3220,12 @@ msgstr ""
 "FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:578
+#: apt-ftparchive.1.xml:557
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:559
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3247,12 +3234,12 @@ msgstr ""
 "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:584
+#: apt-ftparchive.1.xml:563
 msgid "<option>--arch</option>"
 msgstr "<option>--arch</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:585
+#: apt-ftparchive.1.xml:564
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3266,12 +3253,12 @@ msgstr ""
 "<literal>APT::FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:591
+#: apt-ftparchive.1.xml:570
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:593
+#: apt-ftparchive.1.xml:572
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3294,12 +3281,12 @@ msgstr ""
 "survenir et l'ensemble de ces contrôles devient inutile."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:603
+#: apt-ftparchive.1.xml:582
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:605
+#: apt-ftparchive.1.xml:584
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3315,19 +3302,19 @@ msgstr ""
 "generate."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544
-#: sources.list.5.xml:209
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1104 apt_preferences.5.xml:544
+#: sources.list.5.xml:214
 msgid "Examples"
 msgstr "Exemples"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:623
+#: apt-ftparchive.1.xml:602
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:619
+#: apt-ftparchive.1.xml:598
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3336,7 +3323,7 @@ msgstr ""
 "des paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:633
+#: apt-ftparchive.1.xml:612
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3365,96 +3352,8 @@ msgid "APT package handling utility -- command-line interface"
 msgstr ""
 "Utilitaire APT pour la gestion des paquets -- interface en ligne de commande."
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-get.8.xml:39
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
-#| "<arg> <option>-t=</option> <arg choice='plain'> "
-#| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
-#| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
-#| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
-#| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
-#| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-#| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-#| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
-#| "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#| "<group choice='req'> <arg choice='plain'> "
-#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#| "help</arg> </group> </arg> </group>"
-msgid ""
-"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
-"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
-"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
-"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> "
-"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice="
-"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
-"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
-"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
-"arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
-"<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-"<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
-"</group> </arg> </group>"
-msgstr ""
-"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>options_de_configuration</replaceable> </option> </"
-"arg> <arg> <option>-c= <replaceable>fichier_de_configuration</replaceable> </"
-"option> </arg> <arg> <option>-t=</option> <arg choice='plain'> "
-"<replaceable>nom_version_cible</replaceable> </arg> </arg> <group choice="
-"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
-"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
-"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>paquet</replaceable> <arg> <group choice='req'> <arg "
-"choice='plain'> =<replaceable>numéro_version_paquet</replaceable> </arg> "
-"<arg choice='plain'> /<replaceable>nom_version_cible</replaceable> </arg> </"
-"group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>paquet</replaceable></arg></arg> <arg "
-"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>paquet</replaceable></arg></arg> <arg choice='plain'>source "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable> <arg> "
-"<group choice='req'> <arg choice='plain'> "
-"=<replaceable>numéro_version_paquet</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>nom_version_cible</replaceable> </arg> </"
-"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></arg> <arg "
-"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
-"</group> </arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:122
+#: apt-get.8.xml:39
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
@@ -3467,12 +3366,12 @@ msgstr ""
 "existent, comme &dselect;, &aptitude;, &synaptic; and &wajig;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:131 apt-key.8.xml:127
+#: apt-get.8.xml:48 apt-key.8.xml:119
 msgid "update"
 msgstr "update"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:132
+#: apt-get.8.xml:49
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -3497,12 +3396,12 @@ msgstr ""
 "ne peut être connue à l'avance."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:143 guide.sgml:121
+#: apt-get.8.xml:60 guide.sgml:121
 msgid "upgrade"
 msgstr "upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:144
+#: apt-get.8.xml:61
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -3528,12 +3427,12 @@ msgstr ""
 "l'existence de nouvelles versions des paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:156
+#: apt-get.8.xml:73
 msgid "dselect-upgrade"
 msgstr "dselect-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:157
+#: apt-get.8.xml:74
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -3551,12 +3450,12 @@ msgstr ""
 "installation de nouveaux paquets)."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:166 guide.sgml:140
+#: apt-get.8.xml:83 guide.sgml:140
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:167
+#: apt-get.8.xml:84
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3579,12 +3478,12 @@ msgstr ""
 "un mécanisme de remplacement des paramètres généraux pour certains paquets."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:179 guide.sgml:131
+#: apt-get.8.xml:96 guide.sgml:131
 msgid "install"
 msgstr "install"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:181
+#: apt-get.8.xml:98
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -3612,7 +3511,7 @@ msgstr ""
 "des conflits d'apt-get."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:116
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -3629,7 +3528,7 @@ msgstr ""
 "unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:123
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -3639,7 +3538,7 @@ msgstr ""
 "avec précaution."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:209
+#: apt-get.8.xml:126
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -3659,7 +3558,7 @@ msgstr ""
 "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:220
+#: apt-get.8.xml:137
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -3668,7 +3567,7 @@ msgstr ""
 "l'installation des paquets."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:141
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -3689,12 +3588,12 @@ msgstr ""
 "d'utiliser une expression plus précise."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:233
+#: apt-get.8.xml:150
 msgid "remove"
 msgstr "remove"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:151
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -3710,12 +3609,12 @@ msgstr ""
 "d'être supprimé."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:241
+#: apt-get.8.xml:158
 msgid "purge"
 msgstr "purge"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:242
+#: apt-get.8.xml:159
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -3726,12 +3625,12 @@ msgstr ""
 "de configuration sont également effacés)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:163
 msgid "source"
 msgstr "source"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:247
+#: apt-get.8.xml:164
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -3751,7 +3650,7 @@ msgstr ""
 "respect the default release\"\"\" me paraît douteux."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:255
+#: apt-get.8.xml:172
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> type lines in the &sources-list; file. This means that you "
@@ -3767,7 +3666,7 @@ msgstr ""
 "installé ou que vous voulez installer."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:179
 #, fuzzy
 #| msgid ""
 #| "If the <option>--compile</option> option is specified then the package "
@@ -3786,7 +3685,7 @@ msgstr ""
 "download-only</option> est spécifié, le source n'est pas décompacté."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:186
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -3801,7 +3700,7 @@ msgstr ""
 "Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:275
+#: apt-get.8.xml:192
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -3812,12 +3711,12 @@ msgstr ""
 "sont semblables à des sources téléchargées sous forme d'archives tar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:280
+#: apt-get.8.xml:197
 msgid "build-dep"
 msgstr "build-dep"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:281
+#: apt-get.8.xml:198
 #, fuzzy
 #| msgid ""
 #| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
@@ -3834,12 +3733,12 @@ msgstr ""
 "paquet source."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
+#: apt-get.8.xml:204
 msgid "check"
 msgstr "check"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:205
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -3848,12 +3747,16 @@ msgstr ""
 "jour le cache des paquets et cherche les dépendances défectueuses."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:209
 msgid "download"
 msgstr "download"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:210
+#, fuzzy
+#| msgid ""
+#| "<literal>download</literal> will download the given binary package into "
+#| "the current directory."
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
@@ -3862,7 +3765,7 @@ msgstr ""
 "répertoire courant."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:299
+#: apt-get.8.xml:216
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -3881,12 +3784,12 @@ msgstr ""
 "temps en temps si l'on veut libérer de l'espace disque."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:225
 msgid "autoclean"
 msgstr "autoclean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:309
+#: apt-get.8.xml:226
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -3905,12 +3808,12 @@ msgstr ""
 "installés."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:318
+#: apt-get.8.xml:235
 msgid "autoremove"
 msgstr "autoremove"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
+#: apt-get.8.xml:236
 #, fuzzy
 #| msgid ""
 #| "<literal>autoremove</literal> is used to remove packages that were "
@@ -3926,12 +3829,12 @@ msgstr ""
 "ne sont plus nécessaires."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323
+#: apt-get.8.xml:240
 msgid "changelog"
 msgstr "changelog"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:241
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -3953,12 +3856,12 @@ msgstr ""
 "<option>install</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:346
+#: apt-get.8.xml:263
 msgid "<option>--no-install-recommends</option>"
 msgstr "<option>--no-install-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:264
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -3967,12 +3870,12 @@ msgstr ""
 "Élément de configuration : <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:351
+#: apt-get.8.xml:268
 msgid "<option>--install-suggests</option>"
 msgstr "<option>--install-suggests</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml:269
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
@@ -3981,12 +3884,12 @@ msgstr ""
 "de configuration : <literal>APT::Install-Suggests</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:356
+#: apt-get.8.xml:273
 msgid "<option>--download-only</option>"
 msgstr "<option>--download-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:357
+#: apt-get.8.xml:274
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -3996,12 +3899,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:361
+#: apt-get.8.xml:278
 msgid "<option>--fix-broken</option>"
 msgstr "<option>--fix-broken</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:362
+#: apt-get.8.xml:279
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
@@ -4029,17 +3932,17 @@ msgstr ""
 "configuration : <literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:375
+#: apt-get.8.xml:292
 msgid "<option>--ignore-missing</option>"
 msgstr "<option>--ignore-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:376
+#: apt-get.8.xml:293
 msgid "<option>--fix-missing</option>"
 msgstr "<option>--fix-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:294
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -4059,12 +3962,12 @@ msgstr ""
 "<literal>APT::Get::Fix-Missing</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:387
+#: apt-get.8.xml:304
 msgid "<option>--no-download</option>"
 msgstr "<option>--no-download</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:388
+#: apt-get.8.xml:305
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -4076,7 +3979,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:395
+#: apt-get.8.xml:312
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -4098,17 +4001,17 @@ msgstr ""
 "configuration : <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:405
+#: apt-get.8.xml:322
 msgid "<option>--simulate</option>"
 msgstr "<option>--simulate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:407
+#: apt-get.8.xml:324
 msgid "<option>--dry-run</option>"
 msgstr "<option>--dry-run</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:410
+#: apt-get.8.xml:327
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -4119,7 +4022,7 @@ msgstr ""
 "<literal>APT::Get::Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:331
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "
@@ -4138,7 +4041,7 @@ msgstr ""
 "utile qu'<literal>apt-get</literal> envoie de telles notifications)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:337
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4151,22 +4054,22 @@ msgstr ""
 "que les dommages n'ont aucune conséquence (rare)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:344
 msgid "<option>-y</option>"
 msgstr "<option>-y</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:344
 msgid "<option>--yes</option>"
 msgstr "<option>--yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:428
+#: apt-get.8.xml:345
 msgid "<option>--assume-yes</option>"
 msgstr "<option>--assume-yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:429
+#: apt-get.8.xml:346
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -4182,17 +4085,37 @@ msgstr ""
 "configuration : <literal>APT::Get::Assume-Yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:353
+#, fuzzy
+#| msgid "<option>--assume-yes</option>"
+msgid "<option>--assume-no</option>"
+msgstr "<option>--assume-yes</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:354
+#, fuzzy
+#| msgid ""
+#| "Locations to fetch packages from.  Configuration Item: <literal>Dir::Etc::"
+#| "SourceList</literal>."
+msgid ""
+"Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
+"Assume-No</literal>."
+msgstr ""
+"Emplacements où aller chercher les paquets. Élément de configuration : "
+"<literal>Dir::Etc::SourceList</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:358
 msgid "<option>-u</option>"
 msgstr "<option>-u</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:358
 msgid "<option>--show-upgraded</option>"
 msgstr "<option>--show-upgraded</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:437
+#: apt-get.8.xml:359
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4202,17 +4125,17 @@ msgstr ""
 "Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:364
 msgid "<option>-V</option>"
 msgstr "<option>-V</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:364
 msgid "<option>--verbose-versions</option>"
 msgstr "<option>--verbose-versions</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:365
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -4221,14 +4144,14 @@ msgstr ""
 "Élément de configuration : <literal>APT::Get::Show-Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:370
 #, fuzzy
 #| msgid "<option>--recurse</option>"
 msgid "<option>--host-architecture</option>"
 msgstr "<option>--recurse</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:371
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
@@ -4239,22 +4162,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:379
 msgid "<option>-b</option>"
 msgstr "<option>-b</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:379
 msgid "<option>--compile</option>"
 msgstr "<option>--compile</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:458
+#: apt-get.8.xml:380
 msgid "<option>--build</option>"
 msgstr "<option>--build</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:459
+#: apt-get.8.xml:381
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -4263,12 +4186,12 @@ msgstr ""
 "configuration : <literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:385
 msgid "<option>--ignore-hold</option>"
 msgstr "<option>--ignore-hold</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:464
+#: apt-get.8.xml:386
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -4282,12 +4205,12 @@ msgstr ""
 "<literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:470
+#: apt-get.8.xml:392
 msgid "<option>--no-upgrade</option>"
 msgstr "<option>--no-upgrade</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:393
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4300,12 +4223,12 @@ msgstr ""
 "Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:477
+#: apt-get.8.xml:399
 msgid "<option>--only-upgrade</option>"
 msgstr "<option>--only-upgrade</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:478
+#: apt-get.8.xml:400
 msgid ""
 "Do not install new packages; When used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will prevent packages on the "
@@ -4319,12 +4242,12 @@ msgstr ""
 "Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:484
+#: apt-get.8.xml:406
 msgid "<option>--force-yes</option>"
 msgstr "<option>--force-yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:485
+#: apt-get.8.xml:407
 msgid ""
 "Force yes; This is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -4340,12 +4263,12 @@ msgstr ""
 "yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:492
+#: apt-get.8.xml:414
 msgid "<option>--print-uris</option>"
 msgstr "<option>--print-uris</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:493
+#: apt-get.8.xml:415
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected md5 "
@@ -4367,12 +4290,12 @@ msgstr ""
 "<literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:503
+#: apt-get.8.xml:425
 msgid "<option>--purge</option>"
 msgstr "<option>--purge</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:504
+#: apt-get.8.xml:426
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -4386,12 +4309,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
+#: apt-get.8.xml:433
 msgid "<option>--reinstall</option>"
 msgstr "<option>--reinstall</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:434
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4400,12 +4323,12 @@ msgstr ""
 "Élément de configuration : <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:516
+#: apt-get.8.xml:438
 msgid "<option>--list-cleanup</option>"
 msgstr "<option>--list-cleanup</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:517
+#: apt-get.8.xml:439
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -4423,17 +4346,17 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:448
 msgid "<option>--target-release</option>"
 msgstr "<option>--target-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:527
+#: apt-get.8.xml:449
 msgid "<option>--default-release</option>"
 msgstr "<option>--default-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:450
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -4455,12 +4378,12 @@ msgstr ""
 "Release</literal>.  Voyez aussi la page de manuel d'&apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:541
+#: apt-get.8.xml:463
 msgid "<option>--trivial-only</option>"
 msgstr "<option>--trivial-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:465
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4474,12 +4397,12 @@ msgstr ""
 "Get::Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
+#: apt-get.8.xml:471
 msgid "<option>--no-remove</option>"
 msgstr "<option>--no-remove</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:550
+#: apt-get.8.xml:472
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4489,12 +4412,12 @@ msgstr ""
 "Remove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:477
 msgid "<option>--auto-remove</option>"
 msgstr "<option>--auto-remove</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:556
+#: apt-get.8.xml:478
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4507,12 +4430,12 @@ msgstr ""
 "inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:562
+#: apt-get.8.xml:484
 msgid "<option>--only-source</option>"
 msgstr "<option>--only-source</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:563
+#: apt-get.8.xml:485
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -4532,22 +4455,22 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--diff-only</option>"
 msgstr "<option>--diff-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--dsc-only</option>"
 msgstr "<option>--dsc-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--tar-only</option>"
 msgstr "<option>--tar-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:574
+#: apt-get.8.xml:496
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4559,12 +4482,12 @@ msgstr ""
 "literal>, "
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:579
+#: apt-get.8.xml:501
 msgid "<option>--arch-only</option>"
 msgstr "<option>--arch-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:580
+#: apt-get.8.xml:502
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -4574,12 +4497,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:584
+#: apt-get.8.xml:506
 msgid "<option>--allow-unauthenticated</option>"
 msgstr "<option>--allow-unauthenticated</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:585
+#: apt-get.8.xml:507
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -4591,7 +4514,7 @@ msgstr ""
 "AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:598
+#: apt-get.8.xml:520
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
@@ -4600,7 +4523,7 @@ msgstr ""
 "&file-statelists;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:607
+#: apt-get.8.xml:529
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -4611,7 +4534,7 @@ msgstr ""
 "« HOWTO » d'APT."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:613
+#: apt-get.8.xml:535
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -4620,22 +4543,22 @@ msgstr ""
 "décimal 100 en cas d'erreur."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:616
+#: apt-get.8.xml:538
 msgid "ORIGINAL AUTHORS"
 msgstr "AUTEURS D'ORIGINE"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:617
+#: apt-get.8.xml:539
 msgid "&apt-author.jgunthorpe;"
 msgstr "&apt-author.jgunthorpe;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:620
+#: apt-get.8.xml:542
 msgid "CURRENT AUTHORS"
 msgstr "AUTEURS ACTUELS"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:622
+#: apt-get.8.xml:544
 msgid "&apt-author.team;"
 msgstr "&apt-author.team;"
 
@@ -4649,21 +4572,8 @@ msgstr "apt-key"
 msgid "APT key management utility"
 msgstr "Utilitaire de gestion des clés d'APT"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-key.8.xml:31
-msgid ""
-"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
-"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
-"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
-"arg>"
-msgstr ""
-"<command>apt-key</command> <arg><option>--keyring <replaceable>fichier</"
-"replaceable></option></arg> <arg><replaceable>commande</replaceable></arg> "
-"<arg rep=\"repeat\"><option><replaceable>paramètres</replaceable></option></"
-"arg>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:40
+#: apt-key.8.xml:32
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -4673,83 +4583,90 @@ msgstr ""
 "les paquets. Les paquets authentifiés par ces clés seront réputés fiables."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:46
+#: apt-key.8.xml:38
 msgid "Commands"
 msgstr "Commandes"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:48
-msgid "add <replaceable>filename</replaceable>"
-msgstr "add <replaceable>fichier</replaceable>"
+#: apt-key.8.xml:40
+msgid "add &synopsis-param-filename;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:44
+#, fuzzy
+#| msgid ""
+#| "Add a new key to the list of trusted keys.  The key is read from "
+#| "<replaceable>filename</replaceable>, or standard input if "
+#| "<replaceable>filename</replaceable> is <literal>-</literal>."
 msgid ""
-"Add a new key to the list of trusted keys.  The key is read from "
-"<replaceable>filename</replaceable>, or standard input if "
-"<replaceable>filename</replaceable> is <literal>-</literal>."
+"Add a new key to the list of trusted keys.  The key is read from &synopsis-"
+"param-filename;, or standard input if &synopsis-param-filename; is <literal>-"
+"</literal>."
 msgstr ""
 "Ajouter une clé à la liste des clés fiables. La clé est lue dans "
 "<replaceable>fichier</replaceable>, ou sur l'entrée standard si "
 "<replaceable>fichier</replaceable> est <literal>-</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:60
-msgid "del <replaceable>keyid</replaceable>"
-msgstr "del <replaceable>clé</replaceable>"
+#: apt-key.8.xml:52
+msgid "del &synopsis-param-keyid;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:64
+#: apt-key.8.xml:56
 msgid "Remove a key from the list of trusted keys."
 msgstr "Supprimer une clé de la liste des clés fiables."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:71
-msgid "export <replaceable>keyid</replaceable>"
-msgstr "export <replaceable>clé</replaceable>"
+#: apt-key.8.xml:63
+msgid "export &synopsis-param-keyid;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:75
-msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+#: apt-key.8.xml:67
+#, fuzzy
+#| msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "Afficher la clé <replaceable>clé</replaceable> sur la sortie standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:74
 msgid "exportall"
 msgstr "exportall"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:86
+#: apt-key.8.xml:78
 msgid "Output all trusted keys to standard output."
 msgstr "Afficher toutes les clés fiables sur la sortie standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:85
 msgid "list"
 msgstr "list"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:97
+#: apt-key.8.xml:89
 msgid "List trusted keys."
 msgstr "Afficher la liste des clés fiables."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:96
 msgid "finger"
 msgstr "finger"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:108
+#: apt-key.8.xml:100
 msgid "List fingerprints of trusted keys."
 msgstr "Afficher les empreintes des clés fiables."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:107
 msgid "adv"
 msgstr "adv"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:119
+#: apt-key.8.xml:111
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -4758,7 +4675,7 @@ msgstr ""
 "possible de télécharger une clé publique."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:131
+#: apt-key.8.xml:123
 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 "
@@ -4768,14 +4685,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:141
+#: apt-key.8.xml:133
 #, fuzzy
 #| msgid "update"
 msgid "net-update"
 msgstr "update"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:137
 msgid ""
 "Work similar to the <command>update</command> command above, but get the "
 "archive keyring from an URI instead and validate it against a master key.  "
@@ -4786,7 +4703,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:154
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -4795,12 +4712,20 @@ msgstr ""
 "décrites dans la section suivante."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:164
-msgid "--keyring <replaceable>filename</replaceable>"
-msgstr "--keyring <replaceable>fichier</replaceable>"
+#: apt-key.8.xml:156
+msgid "--keyring &synopsis-param-filename;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:165
+#: apt-key.8.xml:157
+#, fuzzy
+#| msgid ""
+#| "With this option it is possible to specify a specific keyring file the "
+#| "command should operate on. The default is that a command is executed on "
+#| "the <filename>trusted.gpg</filename> file as well as on all parts in the "
+#| "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
+#| "gpg</filename> is the primary keyring which means that e.g. new keys are "
+#| "added to this one."
 msgid ""
 "With this option it is possible to specify a specific keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -4817,44 +4742,44 @@ msgstr ""
 "les nouvelles clés y seront ajoutées."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:178
+#: apt-key.8.xml:170
 msgid "&file-trustedgpg;"
 msgstr "&file-trustedgpg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:180
+#: apt-key.8.xml:172
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:173
 msgid "Local trust database of archive keys."
 msgstr "Base de données locale de fiabilité des clés de l'archive."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:184
+#: apt-key.8.xml:176
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:177
 msgid "Keyring of Debian archive trusted keys."
 msgstr "Trousseau des clés fiables de l'archive Debian."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:188
+#: apt-key.8.xml:180
 msgid ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:181
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr "Trousseau des clés fiables supprimées de l'archive Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:198
+#: apt-key.8.xml:190
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
@@ -4882,34 +4807,8 @@ msgstr "apt-mark"
 msgid "mark/unmark a package as being automatically-installed"
 msgstr "Indiquer si un paquet a été installé automatiquement ou non"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-mark.8.xml:39
-#, fuzzy
-#| msgid ""
-#| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
-#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
-#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
-msgid ""
-"  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
-"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
-"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> </group>"
-msgstr ""
-"  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-"f=<replaceable>FICHIER</replaceable></option></arg> <group choice=\"plain\"> "
-"<arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:39
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -4918,7 +4817,7 @@ msgstr ""
 "a été automatiquement installé ou pas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:61
+#: apt-mark.8.xml:43
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -4934,14 +4833,14 @@ msgstr ""
 "command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:51
 #, fuzzy
 #| msgid "markauto"
 msgid "auto"
 msgstr "markauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:52
 #, fuzzy
 #| msgid ""
 #| "<literal>markauto</literal> is used to mark a package as being "
@@ -4957,12 +4856,12 @@ msgstr ""
 "que plus aucun paquet installé manuellement ne dépend de lui."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:59
 msgid "manual"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:78
+#: apt-mark.8.xml:60
 #, fuzzy
 #| msgid ""
 #| "<literal>unmarkauto</literal> is used to mark a package as being manually "
@@ -4978,12 +4877,12 @@ msgstr ""
 "aucun autre paquet n'en dépend."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:67
 msgid "hold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:68
 msgid ""
 "<literal>hold</literal> is used to mark a package as hold back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -4993,12 +4892,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:95
+#: apt-mark.8.xml:77
 msgid "unhold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:78
 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "
@@ -5011,12 +4910,12 @@ msgstr ""
 "un paquet par ligne."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:83
 msgid "showauto"
 msgstr "showauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:102
+#: apt-mark.8.xml:84
 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "
@@ -5031,14 +4930,14 @@ msgstr ""
 "un paquet par ligne."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:109
+#: apt-mark.8.xml:91
 #, fuzzy
 #| msgid "showauto"
 msgid "showmanual"
 msgstr "showauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:110
+#: apt-mark.8.xml:92
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -5046,14 +4945,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:116
+#: apt-mark.8.xml:98
 #, fuzzy
 #| msgid "showauto"
 msgid "showhold"
 msgstr "showauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:99
 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "
@@ -5066,14 +4965,14 @@ msgstr ""
 "un paquet par ligne."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:130
+#: apt-mark.8.xml:112
 msgid ""
 "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
 "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:131
+#: apt-mark.8.xml:113
 msgid ""
 "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
 "option>"
@@ -5082,7 +4981,7 @@ msgstr ""
 "option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:116
 msgid ""
 "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
 "filename> instead of the default location, which is "
@@ -5095,17 +4994,17 @@ msgstr ""
 "par l'élément de configuration <literal>Dir::State</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:146
+#: apt-mark.8.xml:128
 msgid "  &file-extended_states;"
 msgstr "  &file-extended_states;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:151
+#: apt-mark.8.xml:133
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr "&apt-get;,&aptitude;,&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:155
+#: apt-mark.8.xml:137
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -5437,21 +5336,8 @@ msgstr "apt-sortpkgs"
 msgid "Utility to sort package index files"
 msgstr "Outil de tri des index de paquets."
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-sortpkgs.1.xml:39
-msgid ""
-"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-msgstr ""
-"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-"<arg><option>-o=<replaceable>option de configuration</replaceable></option></"
-"arg> <arg><option>-c=<replaceable>fichier</replaceable></option></arg> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>fichier</replaceable></arg>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:48
+#: apt-sortpkgs.1.xml:39
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (Source index or "
 "Package index) and sort the records so that they are ordered by the package "
@@ -5464,19 +5350,19 @@ msgstr ""
 "internes."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:54
+#: apt-sortpkgs.1.xml:45
 msgid "All output is sent to stdout, the input must be a seekable file."
 msgstr ""
 "Le résultat est envoyé sur la sortie standard ; l'entrée doit être un "
 "fichier analysable."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:61
+#: apt-sortpkgs.1.xml:52
 msgid "<option>--source</option>"
 msgstr "<option>--source</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:63
+#: apt-sortpkgs.1.xml:54
 msgid ""
 "Use Source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -5485,7 +5371,7 @@ msgstr ""
 "configuration : <literal>APT::SortPkgs::Source</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:77
+#: apt-sortpkgs.1.xml:68
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -6219,6 +6105,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:294
+#, fuzzy
+#| msgid ""
+#| "Two sub-options to limit the use of PDiffs are also available: With "
+#| "<literal>FileLimit</literal> can be specified how many PDiff files are "
+#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+#| "other hand is the maximum percentage of the size of all patches compared "
+#| "to the size of the targeted file. If one of these limits is exceeded the "
+#| "complete file is downloaded instead of the patches."
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: With "
 "<literal>FileLimit</literal> can be specified how many PDiff files are "
@@ -6288,7 +6182,7 @@ msgstr ""
 "archives de sources au lieu de les copier.  Par défaut à « true »."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:321 sources.list.5.xml:155
+#: apt.conf.5.xml:321 sources.list.5.xml:160
 msgid "http"
 msgstr "http"
 
@@ -6449,7 +6343,7 @@ msgstr ""
 "ou 'SSLv3'."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:387 sources.list.5.xml:166
+#: apt.conf.5.xml:387 sources.list.5.xml:171
 msgid "ftp"
 msgstr "ftp"
 
@@ -6537,7 +6431,7 @@ msgstr ""
 "des serveurs FTP ne suivent pas la RFC 2428."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426 sources.list.5.xml:148
+#: apt.conf.5.xml:426 sources.list.5.xml:153
 msgid "cdrom"
 msgstr "cdrom"
 
@@ -6705,6 +6599,12 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:466
+#, fuzzy
+#| msgid ""
+#| "The special type <literal>uncompressed</literal> can be used to give "
+#| "uncompressed files a preference, but note that most archives don't "
+#| "provide uncompressed files so this is mostly only useable for local "
+#| "mirrors."
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -9500,8 +9400,19 @@ msgid ""
 "will be downloaded."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:121
+msgid ""
+"<literal>trusted=yes</literal> can be set to indicate that packages from "
+"this source are always authenificated even if the <filename>Release</"
+"filename> file is not signed or the signature can't be checked. This "
+"disables parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context. <literal>trusted=no</literal> is the opposite which "
+"handles even correctly authenificated sources as not authenificated."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:123
+#: sources.list.5.xml:128
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -9514,12 +9425,12 @@ msgstr ""
 "les hôtes distants."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:128
+#: sources.list.5.xml:133
 msgid "Some examples:"
 msgstr "Exemples :"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:135
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -9531,17 +9442,17 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:141
 msgid "URI specification"
 msgstr "Spécification des URI"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:146
 msgid "file"
 msgstr "file"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:143
+#: sources.list.5.xml:148
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -9552,7 +9463,7 @@ msgstr ""
 "avec les montages NFS, les miroirs et les archives locaux."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:150
+#: sources.list.5.xml:155
 msgid ""
 "The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -9562,7 +9473,7 @@ msgstr ""
 "pour créer des entrées dans la liste des sources."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:157
+#: sources.list.5.xml:162
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -9579,7 +9490,7 @@ msgstr ""
 "Notez qu'il s'agit d'une méthode d'authentification peu sûre."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:173
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
@@ -9599,12 +9510,12 @@ msgstr ""
 "et qui sont spécifiés dans le fichier de configuration seront ignorés."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:177
+#: sources.list.5.xml:182
 msgid "copy"
 msgstr "copy"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:179
+#: sources.list.5.xml:184
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -9616,17 +9527,17 @@ msgstr ""
 "gens qui utilisent un disque zip pour recopier des fichiers avec APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
 msgid "rsh"
 msgstr "rsh"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
 msgid "ssh"
 msgstr "ssh"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:186
+#: sources.list.5.xml:191
 msgid ""
 "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
 "user and access the files. It is a good idea to do prior arrangements with "
@@ -9641,12 +9552,12 @@ msgstr ""
 "commandes standard <command>find</command> et <command>dd</command>."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:199
 msgid "more recognizable URI types"
 msgstr "plus de types d'URI simples à reconnaître"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:196
+#: sources.list.5.xml:201
 msgid ""
 "APT can be extended with more methods shipped in other optional packages "
 "which should follow the nameing scheme <literal>apt-transport-"
@@ -9668,7 +9579,7 @@ msgstr ""
 "citerefentry>)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:138
+#: sources.list.5.xml:143
 msgid ""
 "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
 "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -9677,7 +9588,7 @@ msgstr ""
 "ssh et rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:215
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -9686,37 +9597,37 @@ msgstr ""
 "debian pour stable/main, stable/contrib et stable/non-free."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:217
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:214
+#: sources.list.5.xml:219
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "Comme ci-dessus, excepté que cette ligne utilise la distribution "
 "« unstable » (développement)."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:220
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:222
 msgid "Source line for the above"
 msgstr "La précédente ligne, mais pour les sources."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:223
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:225
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -9724,7 +9635,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:227
 #, fuzzy, no-wrap
 #| msgid ""
 #| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -9739,7 +9650,7 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:230
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -9748,13 +9659,13 @@ msgstr ""
 "n'utiliser que la section hamm/main."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
+#: sources.list.5.xml:232
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:229
+#: sources.list.5.xml:234
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -9763,13 +9674,13 @@ msgstr ""
 "répertoire debian, et n'utiliser que la section &stable-codename;/contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:231
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:238
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -9782,19 +9693,19 @@ msgstr ""
 "apparaissent, une seule session FTP sera utilisée pour les deux lignes."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:246
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:244
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -9814,7 +9725,7 @@ msgstr ""
 "type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:256
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
@@ -11381,12 +11292,314 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
 #~ msgid ""
+#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
+#~ "arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> "
+#~ "<arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</"
+#~ "replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>depends <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~ "<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~ "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
+#~ "\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~ "<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
+#~ "group>"
+#~ msgstr ""
+#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
+#~ "<arg><option>-o=<replaceable>option de configuration</replaceable></"
+#~ "option></arg> <arg><option>-c=<replaceable>fichier</replaceable></"
+#~ "option></arg> <group choice=\"req\"> <arg>gencaches</arg> <arg>showpkg "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></"
+#~ "arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>paquet</replaceable></arg></arg> <arg>stats</arg> "
+#~ "<arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg "
+#~ "choice=\"plain\"><replaceable>regex</replaceable></arg></arg> <arg>show "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></"
+#~ "arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>paquet</replaceable></arg></arg> <arg>rdepends <arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></"
+#~ "arg> <arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</"
+#~ "replaceable></arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>paquet</replaceable></arg></arg> <arg>policy <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>paquets</replaceable></arg></arg> "
+#~ "<arg>madison <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquets</"
+#~ "replaceable></arg></arg> </group>"
+
+#~ msgid ""
+#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
+#~ "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></"
+#~ "arg> <arg><option>-o=<replaceable>config string</replaceable></option></"
+#~ "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> "
+#~ "<group> <arg>add</arg> <arg>ident</arg> </group>"
+#~ msgstr ""
+#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
+#~ "<arg><option>-d=<replaceable>point de montage du CD</replaceable></"
+#~ "option></arg> <arg><option>-o=<replaceable>option de configuration</"
+#~ "replaceable></option></arg> <arg><option>-c=<replaceable>fichier</"
+#~ "replaceable></option></arg> <group> <arg>add</arg> <arg>ident</arg> </"
+#~ "group>"
+
+#~ msgid ""
+#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
+#~ msgstr ""
+#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-o=<replaceable>option de configuration</replaceable></"
+#~ "option></arg> <arg><option>-c=<replaceable>fichier</replaceable></"
+#~ "option></arg> <group choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </"
+#~ "group>"
+
+#~ msgid ""
+#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
+#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
+#~ "replaceable></arg>"
+#~ msgstr ""
+#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-t=<replaceable>répertoire temporaire</replaceable></"
+#~ "option></arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>fichier</"
+#~ "replaceable></arg>"
+
+#~ msgid ""
+#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
+#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
+#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+#~ "arg> <arg><option>--arch <replaceable>architecture</replaceable></"
+#~ "option></arg> <arg><option>-o <replaceable>config</"
+#~ "replaceable>=<replaceable>string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
+#~ "replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#~ "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
+#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
+#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
+#~ "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
+#~ "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
+#~ "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
+#~ "group>"
+#~ msgstr ""
+#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg><arg> "
+#~ "<option>--md5</option></arg><arg> <option>--delink</option></arg> "
+#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+#~ "arg> <arg><option>--arch <replaceable>architecture</replaceable></"
+#~ "option></arg> <arg><option>-o <replaceable>option de configuration</"
+#~ "replaceable>=<replaceable>chaîne</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>fichier</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>chemin</replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>préfixe-de-chemin</replaceable></arg></"
+#~ "arg></arg> <arg>sources<arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>chemin</replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>préfixe-de-chemin</replaceable></arg></"
+#~ "arg></arg> <arg>contents <arg choice=\"plain\"><replaceable>chemin</"
+#~ "replaceable></arg></arg> <arg>release <arg choice=\"plain"
+#~ "\"><replaceable>chemin</replaceable></arg></arg> <arg>generate <arg "
+#~ "choice=\"plain\"><replaceable>fichier-de-configuration</replaceable></"
+#~ "arg><arg choice=\"plain\" rep=\"repeat\"><replaceable>section</"
+#~ "replaceable></arg></arg> <arg>clean <arg choice=\"plain"
+#~ "\"><replaceable>fichier-de-configuration</replaceable></arg></arg> </"
+#~ "group>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#~| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
+#~| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </"
+#~| "arg> <arg> <option>-t=</option> <arg choice='plain'> "
+#~| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
+#~| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
+#~| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
+#~| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
+#~| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
+#~| "<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </"
+#~| "arg> <arg choice='plain'> /<replaceable>target_release</replaceable> </"
+#~| "arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
+#~| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
+#~| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
+#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> "
+#~| "<arg> <group choice='req'> <arg choice='plain'> "
+#~| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+#~| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#~| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#~| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#~| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#~| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#~| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#~| "help</arg> </group> </arg> </group>"
+#~ msgid ""
+#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#~ "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
+#~ "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
+#~ "<arg> <option>-t=</option> <arg choice='plain'> "
+#~ "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
+#~ "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
+#~ "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
+#~ "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
+#~ "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
+#~ "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
+#~ "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#~ "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
+#~ "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
+#~ "<group choice='req'> <arg choice='plain'> "
+#~ "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+#~ "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~ "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#~ "help</arg> </group> </arg> </group>"
+#~ msgstr ""
+#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#~ "<option>-o= <replaceable>options_de_configuration</replaceable> </option> "
+#~ "</arg> <arg> <option>-c= <replaceable>fichier_de_configuration</"
+#~ "replaceable> </option> </arg> <arg> <option>-t=</option> <arg "
+#~ "choice='plain'> <replaceable>nom_version_cible</replaceable> </arg> </"
+#~ "arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
+#~ "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> "
+#~ "<arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable> <arg> "
+#~ "<group choice='req'> <arg choice='plain'> "
+#~ "=<replaceable>numéro_version_paquet</replaceable> </arg> <arg "
+#~ "choice='plain'> /<replaceable>nom_version_cible</replaceable> </arg> </"
+#~ "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
+#~ "\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></arg> <arg "
+#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>paquet</replaceable></arg></arg> <arg "
+#~ "choice='plain'>source <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>paquet</replaceable> <arg> <group choice='req'> <arg "
+#~ "choice='plain'> =<replaceable>numéro_version_paquet</replaceable> </arg> "
+#~ "<arg choice='plain'> /<replaceable>nom_version_cible</replaceable> </arg> "
+#~ "</group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></arg> "
+#~ "<arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#~ "help</arg> </group> </arg> </group>"
+
+#~ msgid ""
+#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+#~ "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
+#~ "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
+#~ "option></arg>"
+#~ msgstr ""
+#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>fichier</"
+#~ "replaceable></option></arg> <arg><replaceable>commande</replaceable></"
+#~ "arg> <arg rep=\"repeat\"><option><replaceable>paramètres</replaceable></"
+#~ "option></arg>"
+
+#~ msgid "add <replaceable>filename</replaceable>"
+#~ msgstr "add <replaceable>fichier</replaceable>"
+
+#~ msgid "del <replaceable>keyid</replaceable>"
+#~ msgstr "del <replaceable>clé</replaceable>"
+
+#~ msgid "export <replaceable>keyid</replaceable>"
+#~ msgstr "export <replaceable>clé</replaceable>"
+
+#~ msgid ""
 #~ "Update the local keyring with the keyring of Debian archive keys and "
 #~ "removes from the keyring the archive keys which are no longer valid."
 #~ msgstr ""
 #~ "Mettre à jour le trousseau de clés local avec le trousseau de clés de "
 #~ "l'archive Debian et supprimer les clés qui y sont périmées."
 
+#~ msgid "--keyring <replaceable>filename</replaceable>"
+#~ msgstr "--keyring <replaceable>fichier</replaceable>"
+
+#, fuzzy
+#~| msgid ""
+#~| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#~| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> "
+#~| "<group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> "
+#~| "<arg choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</"
+#~| "arg> </group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#~| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
+#~ msgid ""
+#~ "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
+#~ "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
+#~ "choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
+#~ "choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </"
+#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#~ "replaceable></arg> </arg> </group>"
+#~ msgstr ""
+#~ "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-f=<replaceable>FICHIER</replaceable></option></arg> <group "
+#~ "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
+#~ "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
+#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</"
+#~ "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
+
+#~ msgid ""
+#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
+#~ msgstr ""
+#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
+#~ "<arg><option>-o=<replaceable>option de configuration</replaceable></"
+#~ "option></arg> <arg><option>-c=<replaceable>fichier</replaceable></"
+#~ "option></arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>fichier</"
+#~ "replaceable></arg>"
+
+#, fuzzy
+#~| msgid ""
+#~| "Seconds the Release file should be considered valid after it was "
+#~| "created. The default is \"for ever\" (0) if the Release file of the "
+#~| "archive doesn't include a <literal>Valid-Until</literal> header.  If it "
+#~| "does then this date is the default. The date from the Release file or "
+#~| "the date specified by the creation time of the Release file "
+#~| "(<literal>Date</literal> header) plus the seconds specified with this "
+#~| "options are used to check if the validation of a file has expired by "
+#~| "using the earlier date of the two. Archive specific settings can be made "
+#~| "by appending the label of the archive to the option name."
+#~ msgid ""
+#~ "Seconds the Release file should be considered valid after it was created. "
+#~ "The default is \"for ever\" (0) if the Release file of the archive "
+#~ "doesn't include a <literal>Valid-Until</literal> header.  If it does then "
+#~ "this date is the default. The date from the Release file or the date "
+#~ "specified by the creation time of the Release file (<literal>Date</"
+#~ "literal> header) plus the seconds specified with this options are used to "
+#~ "check if the validation of a file has expired by using the earlier date "
+#~ "of the two. Archive specific settings can be made by appending the label "
+#~ "of the archive to the option name."
+#~ msgstr ""
+#~ "Durée (en secondes) pendant laquelle un fichier Release est considéré "
+#~ "comme valable, à partir du moment de sa création. La valeur par défaut "
+#~ "est 0 (fichier valable indéfiniment) si le fichier Release de l'archive "
+#~ "ne comporte pas d'en-tête <literal>Valid-Until</literal>. Dans le cas "
+#~ "contraire, c'est la valeur de cet en-tête qui est la valeur par défaut du "
+#~ "paramètre. La date du fichier Release ou la date indiquée dans l'en-tête "
+#~ "<literal>Date</literal>, augmentées du nombre de secondes indiquées sont "
+#~ "comparées à la date courante pour déterminer si un fichier Release donné "
+#~ "est obsolète ou pas. Un réglage spécifique pour une archive donnée peut "
+#~ "être défini en ajoutant l'étiquette de l'archive au nom de l'option."
+
 #~ msgid "<option>--md5</option>"
 #~ msgstr "<option>--md5</option>"
 
@@ -11582,13 +11795,6 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ msgid "<filename>/etc/apt/sources.list</filename>"
 #~ msgstr "<filename>/etc/apt/sources.list</filename>"
 
-#~ msgid ""
-#~ "Locations to fetch packages from.  Configuration Item: <literal>Dir::Etc::"
-#~ "SourceList</literal>."
-#~ msgstr ""
-#~ "Emplacements où aller chercher les paquets. Élément de configuration : "
-#~ "<literal>Dir::Etc::SourceList</literal>."
-
 #~ msgid "<filename>&statedir;/lists/</filename>"
 #~ msgstr "<filename>&statedir;/lists/</filename>"
 
diff --git a/doc/po/it.po b/doc/po/it.po
index 24fdc8099..9f6f2c5c1 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2011-11-20 17:58+0100\n"
+"POT-Creation-Date: 2012-04-11 17:54+0300\n"
 "PO-Revision-Date: 2003-04-26 23:26+0100\n"
 "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
 "Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@ -456,7 +456,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:210
+#: apt.ent:211
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -471,6 +471,101 @@ msgid ""
 "\">\n"
 msgstr ""
 
+#. type: Plain text
+#: apt.ent:214
+msgid ""
+"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
+"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:217
+msgid ""
+"<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+"synopsis-config-file \"config_file\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:220
+msgid ""
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
+"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"\"target_release\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:223
+msgid ""
+"<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+"synopsis-architecture \"architecture\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:226
+msgid ""
+"<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+"--> <!ENTITY synopsis-pkg \"pkg\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:229
+msgid ""
+"<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
+"ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:232
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+"pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:235
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+"awesome --> <!ENTITY synopsis-regex \"regex\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:238
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
+"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:241
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
+"apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+"\"temporary_directory\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:244
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+"synopsis-filename \"filename\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:250
+msgid ""
+"<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive "
+"packages path override pathprefix --> <!ENTITY synopsis-path \"path\"> <!"
+"ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section "
+"\"section\"> <!ENTITY synopsis-override \"override\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:253
+msgid ""
+"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+msgstr ""
+
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:16
@@ -505,41 +600,17 @@ msgstr ""
 msgid "query the APT cache"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cache.8.xml:39
-msgid ""
-"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
-"<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
-"arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></arg></"
-"arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>policy <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></"
-"arg> </group>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
-#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121
-#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
-#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
+#: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38
+#: apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38
+#: apt-key.8.xml:30 apt-mark.8.xml:38 apt-secure.8.xml:43
+#: apt-sortpkgs.1.xml:38 apt.conf.5.xml:42 apt_preferences.5.xml:36
 #: sources.list.5.xml:36
 msgid "Description"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:65
+#: apt-cache.8.xml:39
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -548,19 +619,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:70 apt-get.8.xml:127
+#: apt-cache.8.xml:44 apt-get.8.xml:44
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:74
+#: apt-cache.8.xml:48
 msgid "gencaches"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:75
+#: apt-cache.8.xml:49
 msgid ""
 "<literal>gencaches</literal> performs the same operation as <command>apt-get "
 "check</command>. It builds the source and package caches from the sources in "
@@ -568,12 +639,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:81
+#: apt-cache.8.xml:55
 msgid "showpkg <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:82
+#: apt-cache.8.xml:56
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -587,7 +658,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:94
+#: apt-cache.8.xml:68
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -603,7 +674,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:106
+#: apt-cache.8.xml:80
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -615,26 +686,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:89
 msgid "stats"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:89
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:118
+#: apt-cache.8.xml:92
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:122
+#: apt-cache.8.xml:96
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -643,7 +714,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:128
+#: apt-cache.8.xml:102
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -654,7 +725,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:136
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -663,7 +734,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:142
+#: apt-cache.8.xml:116
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -672,7 +743,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:149
+#: apt-cache.8.xml:123
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -682,7 +753,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:130
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache; this value is therefore at least equal to the number of "
@@ -692,19 +763,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:163
+#: apt-cache.8.xml:137
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:170
+#: apt-cache.8.xml:144
 msgid "showsrc <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -712,60 +783,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:176 apt-config.8.xml:87
+#: apt-cache.8.xml:150 apt-config.8.xml:75
 msgid "dump"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:151
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:181
+#: apt-cache.8.xml:155
 msgid "dumpavail"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:156
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:186
+#: apt-cache.8.xml:160
 msgid "unmet"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:161
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml:165
 msgid "show <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:171
 msgid "search <replaceable>regex [ regex ... ]</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:172
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see "
@@ -780,43 +851,43 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:211
+#: apt-cache.8.xml:185
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:215
+#: apt-cache.8.xml:189
 msgid "depends <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:216
+#: apt-cache.8.xml:190
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:220
+#: apt-cache.8.xml:194
 msgid "rdepends <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:195
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:225
+#: apt-cache.8.xml:199
 msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml:200
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -826,7 +897,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:205
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -834,12 +905,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:236
+#: apt-cache.8.xml:210
 msgid "dotty <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:237
+#: apt-cache.8.xml:211
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -852,7 +923,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:246
+#: apt-cache.8.xml:220
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -861,29 +932,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:251
+#: apt-cache.8.xml:225
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
+#: apt-cache.8.xml:228
 msgid "xvcg <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:229
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:259
+#: apt-cache.8.xml:233
 msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:260
+#: apt-cache.8.xml:234
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -892,12 +963,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:266
+#: apt-cache.8.xml:240
 msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:267
+#: apt-cache.8.xml:241
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -909,24 +980,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126
-#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
+#: apt-cache.8.xml:252 apt-config.8.xml:84 apt-extracttemplates.1.xml:51
+#: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
+#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:577 apt.conf.5.xml:599
 msgid "options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:256
 msgid "<option>-p</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:256
 msgid "<option>--pkg-cache</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:283
+#: apt-cache.8.xml:257
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -934,18 +1005,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404
-#: apt-sortpkgs.1.xml:61
+#: apt-cache.8.xml:262 apt-ftparchive.1.xml:551 apt-get.8.xml:321
+#: apt-sortpkgs.1.xml:52
 msgid "<option>-s</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
+#: apt-cache.8.xml:262
 msgid "<option>--src-cache</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:263
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -955,17 +1026,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
+#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311
 msgid "<option>-q</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
+#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311
 msgid "<option>--quiet</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:271
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -974,17 +1045,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:277
 msgid "<option>-i</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:277
 msgid "<option>--important</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:304
+#: apt-cache.8.xml:278
 msgid ""
 "Print only important dependencies; for use with unmet and depends. Causes "
 "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
@@ -992,47 +1063,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
+#: apt-cache.8.xml:283
 msgid "<option>--no-pre-depends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:284
 msgid "<option>--no-depends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:285
 msgid "<option>--no-recommends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:286
 msgid "<option>--no-suggests</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:287
 msgid "<option>--no-conflicts</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:314
+#: apt-cache.8.xml:288
 msgid "<option>--no-breaks</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315
+#: apt-cache.8.xml:289
 msgid "<option>--no-replaces</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:290
 msgid "<option>--no-enhances</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:291
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -1042,35 +1113,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
+#: apt-cache.8.xml:297 apt-cdrom.8.xml:111 apt-get.8.xml:278
 msgid "<option>-f</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323
+#: apt-cache.8.xml:297
 msgid "<option>--full</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:324
+#: apt-cache.8.xml:298
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
-#: apt-get.8.xml:447
+#: apt-cache.8.xml:302 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563
+#: apt-get.8.xml:369
 msgid "<option>-a</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:302
 msgid "<option>--all-versions</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:303
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -1081,17 +1152,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:311
 msgid "<option>-g</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:311
 msgid "<option>--generate</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:312
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1099,29 +1170,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:317
 msgid "<option>--names-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343 apt-cdrom.8.xml:142
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:129
 msgid "<option>-n</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:318
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:348
+#: apt-cache.8.xml:322
 msgid "<option>--all-names</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:323
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -1129,12 +1200,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:354
+#: apt-cache.8.xml:328
 msgid "<option>--recurse</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:355
+#: apt-cache.8.xml:329
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1142,12 +1213,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:360
+#: apt-cache.8.xml:334
 msgid "<option>--installed</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:362
+#: apt-cache.8.xml:336
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -1155,46 +1226,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:591
-#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89
+#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513
+#: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:596 apt-key.8.xml:175 apt-mark.8.xml:144
+#: apt-cache.8.xml:346 apt-get.8.xml:518 apt-key.8.xml:167 apt-mark.8.xml:126
 #: apt.conf.5.xml:1110 apt_preferences.5.xml:697
 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:348
 msgid "&file-sourceslist; &file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:606
-#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704
-#: sources.list.5.xml:250
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94
+#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528
+#: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704
+#: sources.list.5.xml:255
 msgid "See Also"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:380
+#: apt-cache.8.xml:354
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:612
-#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99
+#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534
+#: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:385
+#: apt-cache.8.xml:359
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1217,18 +1288,8 @@ msgstr ""
 msgid "APT CDROM management utility"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cdrom.8.xml:38
-msgid ""
-"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
-"<arg>add</arg> <arg>ident</arg> </group>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
+#: apt-cdrom.8.xml:38
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -1237,7 +1298,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:45
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
@@ -1245,12 +1306,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:68
+#: apt-cdrom.8.xml:55
 msgid "add"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:69
+#: apt-cdrom.8.xml:56
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@ -1260,7 +1321,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:77
+#: apt-cdrom.8.xml:64
 msgid ""
 "APT uses a CDROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -1268,19 +1329,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:84
+#: apt-cdrom.8.xml:71
 msgid "ident"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:85
+#: apt-cdrom.8.xml:72
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:64
+#: apt-cdrom.8.xml:51
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present.  <placeholder type=\"variablelist"
@@ -1288,22 +1349,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:161
+#: apt-cdrom.8.xml:81 apt-key.8.xml:153
 msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
+#: apt-cdrom.8.xml:85 apt-ftparchive.1.xml:519 apt-get.8.xml:273
 msgid "<option>-d</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98
+#: apt-cdrom.8.xml:85
 msgid "<option>--cdrom</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:99
+#: apt-cdrom.8.xml:86
 msgid ""
 "Mount point; specify the location to mount the cdrom. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -1311,17 +1372,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
+#: apt-cdrom.8.xml:94
 msgid "<option>-r</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
+#: apt-cdrom.8.xml:94
 msgid "<option>--rename</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:108
+#: apt-cdrom.8.xml:95
 msgid ""
 "Rename a disc; change the label of a disk or override the disks given label. "
 "This option will cause <command>apt-cdrom</command> to prompt for a new "
@@ -1329,17 +1390,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116 apt-get.8.xml:375
+#: apt-cdrom.8.xml:103 apt-get.8.xml:292
 msgid "<option>-m</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116
+#: apt-cdrom.8.xml:103
 msgid "<option>--no-mount</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:117
+#: apt-cdrom.8.xml:104
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -1347,12 +1408,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:124
+#: apt-cdrom.8.xml:111
 msgid "<option>--fast</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:125
+#: apt-cdrom.8.xml:112
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1361,12 +1422,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:134
+#: apt-cdrom.8.xml:121
 msgid "<option>--thorough</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:135
+#: apt-cdrom.8.xml:122
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1374,22 +1435,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:143 apt-get.8.xml:406
+#: apt-cdrom.8.xml:130 apt-get.8.xml:323
 msgid "<option>--just-print</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:144 apt-get.8.xml:408
+#: apt-cdrom.8.xml:131 apt-get.8.xml:325
 msgid "<option>--recon</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:145 apt-get.8.xml:409
+#: apt-cdrom.8.xml:132 apt-get.8.xml:326
 msgid "<option>--no-act</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:133
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -1397,12 +1458,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:159
+#: apt-cdrom.8.xml:146
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:164
+#: apt-cdrom.8.xml:151
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1427,17 +1488,8 @@ msgstr ""
 msgid "APT Configuration Query program"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-config.8.xml:39
-msgid ""
-"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>shell</arg> <arg>dump</arg> </group>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:51
+#: apt-config.8.xml:39
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -1446,19 +1498,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:56 apt-ftparchive.1.xml:75
+#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:49
 msgid "shell"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:63
+#: apt-config.8.xml:51
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
@@ -1468,7 +1520,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:71
+#: apt-config.8.xml:59
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -1477,14 +1529,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:76
+#: apt-config.8.xml:64
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:80
+#: apt-config.8.xml:68
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -1492,18 +1544,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:89
+#: apt-config.8.xml:77
 msgid "Just show the contents of the configuration space."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
-#: apt-sortpkgs.1.xml:73
+#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112
+#: apt-config.8.xml:100
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1524,17 +1576,8 @@ msgstr ""
 msgid "Utility to extract DebConf config and templates from Debian packages"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-extracttemplates.1.xml:39
-msgid ""
-"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-"<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
-"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
-"arg>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:39
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -1544,12 +1587,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:52
+#: apt-extracttemplates.1.xml:44
 msgid "package version template-file config-script"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:53
+#: apt-extracttemplates.1.xml:45
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
@@ -1558,17 +1601,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63 apt-get.8.xml:525
+#: apt-extracttemplates.1.xml:55 apt-get.8.xml:447
 msgid "<option>-t</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63
+#: apt-extracttemplates.1.xml:55
 msgid "<option>--tempdir</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:65
+#: apt-extracttemplates.1.xml:57
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@ -1576,7 +1619,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:82
+#: apt-extracttemplates.1.xml:74
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -1600,31 +1643,8 @@ msgstr ""
 msgid "Utility to generate index files"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-ftparchive.1.xml:39
-msgid ""
-"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
-"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
-"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
-"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-"replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
-"arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
-"arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
-"replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
-"\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -1633,7 +1653,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:64
+#: apt-ftparchive.1.xml:43
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -1643,7 +1663,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:70
+#: apt-ftparchive.1.xml:49
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -1653,12 +1673,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:79
+#: apt-ftparchive.1.xml:58
 msgid "packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:81
+#: apt-ftparchive.1.xml:60
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -1667,18 +1687,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
+#: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:89
+#: apt-ftparchive.1.xml:68
 msgid "sources"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:70
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -1687,7 +1707,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:75
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -1695,12 +1715,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:101
+#: apt-ftparchive.1.xml:80
 msgid "contents"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:103
+#: apt-ftparchive.1.xml:82
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -1711,12 +1731,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:113
+#: apt-ftparchive.1.xml:92
 msgid "release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:115
+#: apt-ftparchive.1.xml:94
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -1731,7 +1751,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:125
+#: apt-ftparchive.1.xml:104
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -1744,13 +1764,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:115
 #, fuzzy
 msgid "generate"
 msgstr "Descrizione generale"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:138
+#: apt-ftparchive.1.xml:117
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -1760,24 +1780,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
+#: apt-ftparchive.1.xml:124 apt-get.8.xml:215
 msgid "clean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:126
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:153
+#: apt-ftparchive.1.xml:132
 msgid "The Generate Configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:134
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -1788,18 +1808,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:163
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:144
 msgid "Dir Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:146
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -1808,12 +1828,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:151
 msgid "ArchiveDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:153
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -1821,44 +1841,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:179
+#: apt-ftparchive.1.xml:158
 msgid "OverrideDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:160
 msgid "Specifies the location of the override files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:184
+#: apt-ftparchive.1.xml:163
 msgid "CacheDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:165
 msgid "Specifies the location of the cache files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:189
+#: apt-ftparchive.1.xml:168
 msgid "FileListDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:170
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:176
 msgid "Default Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:199
+#: apt-ftparchive.1.xml:178
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -1866,12 +1886,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
+#: apt-ftparchive.1.xml:182
 msgid "Packages::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:184
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -1880,72 +1900,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:190
 msgid "Packages::Extensions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:213
+#: apt-ftparchive.1.xml:192
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:196
 msgid "Sources::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:219
+#: apt-ftparchive.1.xml:198
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:202
 msgid "Sources::Extensions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:225
+#: apt-ftparchive.1.xml:204
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:208
 msgid "Contents::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:210
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:214
 msgid "Translation::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:237
+#: apt-ftparchive.1.xml:216
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
+#: apt-ftparchive.1.xml:220
 msgid "DeLinkLimit"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:222
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -1953,36 +1973,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248
+#: apt-ftparchive.1.xml:227
 msgid "FileMode"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:229
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
+#: apt-ftparchive.1.xml:234 apt-ftparchive.1.xml:380
 msgid "LongDescription"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+#: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:263
+#: apt-ftparchive.1.xml:242
 msgid "TreeDefault Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml:244
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -1990,12 +2010,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:249
 msgid "MaxContentsChange"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:272
+#: apt-ftparchive.1.xml:251
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -2003,12 +2023,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:256
 msgid "ContentsAge"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:279
+#: apt-ftparchive.1.xml:258
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -2019,60 +2039,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:267
 msgid "Directory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:290
+#: apt-ftparchive.1.xml:269
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:273
 msgid "SrcDirectory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:296
+#: apt-ftparchive.1.xml:275
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:418
 msgid "Packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:281
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:306 apt-ftparchive.1.xml:444
+#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:423
 msgid "Sources"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:287
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
+#: apt-ftparchive.1.xml:291
 msgid "Translation"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:293
 msgid ""
 "Set the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
@@ -2080,12 +2100,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319
+#: apt-ftparchive.1.xml:298
 msgid "InternalPrefix"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:300
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -2093,12 +2113,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:305 apt-ftparchive.1.xml:429
 msgid "Contents"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:307
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
@@ -2107,34 +2127,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:314
 msgid "Contents::Header"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:316
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:340 apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:454
 msgid "BinCacheDB"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:342
+#: apt-ftparchive.1.xml:321
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:325
 msgid "FileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:327
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -2142,12 +2162,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:353
+#: apt-ftparchive.1.xml:332
 msgid "SourceFileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:355
+#: apt-ftparchive.1.xml:334
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -2156,12 +2176,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:342
 msgid "Tree Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:365
+#: apt-ftparchive.1.xml:344
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -2171,7 +2191,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:349
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -2180,7 +2200,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:375
+#: apt-ftparchive.1.xml:354
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
@@ -2188,7 +2208,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:381
+#: apt-ftparchive.1.xml:360
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -2198,7 +2218,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:378
+#: apt-ftparchive.1.xml:357
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -2206,12 +2226,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
+#: apt-ftparchive.1.xml:366
 msgid "Sections"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389
+#: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"
@@ -2219,12 +2239,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
+#: apt-ftparchive.1.xml:373 apt.conf.5.xml:157
 msgid "Architectures"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:375
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -2232,56 +2252,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:434
 msgid "BinOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:388
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:439
 msgid "SrcOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:415
+#: apt-ftparchive.1.xml:394
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
+#: apt-ftparchive.1.xml:398 apt-ftparchive.1.xml:444
 msgid "ExtraOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
 msgid "Sets the binary extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:424 apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:403 apt-ftparchive.1.xml:449
 msgid "SrcExtraOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
+#: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
 msgid "Sets the source extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:431
+#: apt-ftparchive.1.xml:410
 msgid "BinDirectory Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:412
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -2291,64 +2311,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:441
+#: apt-ftparchive.1.xml:420
 msgid "Sets the Packages file output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:446
+#: apt-ftparchive.1.xml:425
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml:431
 msgid "Sets the Contents file output. (optional)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:457
+#: apt-ftparchive.1.xml:436
 msgid "Sets the binary override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:441
 msgid "Sets the source override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:477
+#: apt-ftparchive.1.xml:456
 msgid "Sets the cache DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:459
 msgid "PathPrefix"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:461
 msgid "Appends a path to all the output paths."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:464
 msgid "FileList, SourceFileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:466
 msgid "Specifies the file list file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:473
 msgid "The Binary Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:495
+#: apt-ftparchive.1.xml:474
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -2358,19 +2378,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:480
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:482
 #, no-wrap
 msgid "new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:500
+#: apt-ftparchive.1.xml:479
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -2381,12 +2401,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:490
 msgid "The Source Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:513
+#: apt-ftparchive.1.xml:492
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -2394,12 +2414,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:497
 msgid "The Extra Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:520
+#: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -2407,13 +2427,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:508
 msgid ""
 "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml:510
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -2427,19 +2447,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:540
+#: apt-ftparchive.1.xml:519
 msgid "<option>--db</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:521
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:548
+#: apt-ftparchive.1.xml:527
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2448,12 +2468,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:554
+#: apt-ftparchive.1.xml:533
 msgid "<option>--delink</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:556
+#: apt-ftparchive.1.xml:535
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -2462,12 +2482,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:562
+#: apt-ftparchive.1.xml:541
 msgid "<option>--contents</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:564
+#: apt-ftparchive.1.xml:543
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -2477,12 +2497,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:572
+#: apt-ftparchive.1.xml:551
 msgid "<option>--source-override</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:553
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -2490,24 +2510,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:578
+#: apt-ftparchive.1.xml:557
 msgid "<option>--readonly</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:559
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:584
+#: apt-ftparchive.1.xml:563
 msgid "<option>--arch</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:585
+#: apt-ftparchive.1.xml:564
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -2516,12 +2536,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:591
+#: apt-ftparchive.1.xml:570
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:593
+#: apt-ftparchive.1.xml:572
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -2535,12 +2555,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:603
+#: apt-ftparchive.1.xml:582
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:605
+#: apt-ftparchive.1.xml:584
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2550,26 +2570,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544
-#: sources.list.5.xml:209
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1104 apt_preferences.5.xml:544
+#: sources.list.5.xml:214
 msgid "Examples"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:623
+#: apt-ftparchive.1.xml:602
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:619
+#: apt-ftparchive.1.xml:598
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:633
+#: apt-ftparchive.1.xml:612
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -2594,40 +2614,8 @@ msgstr "apt-get"
 msgid "APT package handling utility -- command-line interface"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-get.8.xml:39
-msgid ""
-"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
-"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
-"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
-"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> "
-"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice="
-"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
-"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
-"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
-"arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
-"<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-"<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
-"</group> </arg> </group>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:122
+#: apt-get.8.xml:39
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
@@ -2636,13 +2624,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:131 apt-key.8.xml:127
+#: apt-get.8.xml:48 apt-key.8.xml:119
 #, fuzzy
 msgid "update"
 msgstr "upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:132
+#: apt-get.8.xml:49
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -2656,13 +2644,13 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:143 guide.sgml:121
+#: apt-get.8.xml:60 guide.sgml:121
 #, fuzzy
 msgid "upgrade"
 msgstr "upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:144
+#: apt-get.8.xml:61
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -2677,13 +2665,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:156
+#: apt-get.8.xml:73
 #, fuzzy
 msgid "dselect-upgrade"
 msgstr "dist-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:157
+#: apt-get.8.xml:74
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -2694,13 +2682,13 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:166 guide.sgml:140
+#: apt-get.8.xml:83 guide.sgml:140
 #, fuzzy
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:167
+#: apt-get.8.xml:84
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -2714,13 +2702,13 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:179 guide.sgml:131
+#: apt-get.8.xml:96 guide.sgml:131
 #, fuzzy
 msgid "install"
 msgstr "install"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:181
+#: apt-get.8.xml:98
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -2736,7 +2724,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:116
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -2747,14 +2735,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:123
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:209
+#: apt-get.8.xml:126
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -2766,14 +2754,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:220
+#: apt-get.8.xml:137
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:141
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -2785,12 +2773,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:233
+#: apt-get.8.xml:150
 msgid "remove"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:151
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -2800,12 +2788,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:241
+#: apt-get.8.xml:158
 msgid "purge"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:242
+#: apt-get.8.xml:159
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -2813,12 +2801,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:163
 msgid "source"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:247
+#: apt-get.8.xml:164
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -2830,7 +2818,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:255
+#: apt-get.8.xml:172
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> type lines in the &sources-list; file. This means that you "
@@ -2840,7 +2828,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:179
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -2850,7 +2838,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:186
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -2860,7 +2848,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:275
+#: apt-get.8.xml:192
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -2868,12 +2856,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:280
+#: apt-get.8.xml:197
 msgid "build-dep"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:281
+#: apt-get.8.xml:198
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -2883,31 +2871,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
+#: apt-get.8.xml:204
 msgid "check"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:205
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:209
 msgid "download"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:210
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:299
+#: apt-get.8.xml:216
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -2919,12 +2907,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:225
 msgid "autoclean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:309
+#: apt-get.8.xml:226
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -2936,12 +2924,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:318
+#: apt-get.8.xml:235
 msgid "autoremove"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
+#: apt-get.8.xml:236
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -2949,12 +2937,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323
+#: apt-get.8.xml:240
 msgid "changelog"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:241
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -2967,48 +2955,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:346
+#: apt-get.8.xml:263
 msgid "<option>--no-install-recommends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:264
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:351
+#: apt-get.8.xml:268
 msgid "<option>--install-suggests</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml:269
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:356
+#: apt-get.8.xml:273
 msgid "<option>--download-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:357
+#: apt-get.8.xml:274
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:361
+#: apt-get.8.xml:278
 msgid "<option>--fix-broken</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:362
+#: apt-get.8.xml:279
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
@@ -3024,17 +3012,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:375
+#: apt-get.8.xml:292
 msgid "<option>--ignore-missing</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:376
+#: apt-get.8.xml:293
 msgid "<option>--fix-missing</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:294
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -3046,12 +3034,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:387
+#: apt-get.8.xml:304
 msgid "<option>--no-download</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:388
+#: apt-get.8.xml:305
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -3059,7 +3047,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:395
+#: apt-get.8.xml:312
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3071,17 +3059,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:405
+#: apt-get.8.xml:322
 msgid "<option>--simulate</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:407
+#: apt-get.8.xml:324
 msgid "<option>--dry-run</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:410
+#: apt-get.8.xml:327
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -3089,7 +3077,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:331
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "
@@ -3100,7 +3088,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:337
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -3109,22 +3097,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:344
 msgid "<option>-y</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:344
 msgid "<option>--yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:428
+#: apt-get.8.xml:345
 msgid "<option>--assume-yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:429
+#: apt-get.8.xml:346
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -3134,46 +3122,58 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:353
+msgid "<option>--assume-no</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:354
+msgid ""
+"Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
+"Assume-No</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:358
 msgid "<option>-u</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:358
 msgid "<option>--show-upgraded</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:437
+#: apt-get.8.xml:359
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:364
 msgid "<option>-V</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:364
 msgid "<option>--verbose-versions</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:365
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:370
 msgid "<option>--host-architecture</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:371
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
@@ -3184,34 +3184,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:379
 msgid "<option>-b</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:379
 msgid "<option>--compile</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:458
+#: apt-get.8.xml:380
 msgid "<option>--build</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:459
+#: apt-get.8.xml:381
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:385
 msgid "<option>--ignore-hold</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:464
+#: apt-get.8.xml:386
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -3220,12 +3220,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:470
+#: apt-get.8.xml:392
 msgid "<option>--no-upgrade</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:393
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -3234,12 +3234,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:477
+#: apt-get.8.xml:399
 msgid "<option>--only-upgrade</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:478
+#: apt-get.8.xml:400
 msgid ""
 "Do not install new packages; When used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will prevent packages on the "
@@ -3248,12 +3248,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:484
+#: apt-get.8.xml:406
 msgid "<option>--force-yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:485
+#: apt-get.8.xml:407
 msgid ""
 "Force yes; This is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -3263,12 +3263,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:492
+#: apt-get.8.xml:414
 msgid "<option>--print-uris</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:493
+#: apt-get.8.xml:415
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected md5 "
@@ -3281,12 +3281,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:503
+#: apt-get.8.xml:425
 msgid "<option>--purge</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:504
+#: apt-get.8.xml:426
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -3295,24 +3295,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
+#: apt-get.8.xml:433
 msgid "<option>--reinstall</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:434
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:516
+#: apt-get.8.xml:438
 msgid "<option>--list-cleanup</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:517
+#: apt-get.8.xml:439
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -3323,17 +3323,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:448
 msgid "<option>--target-release</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:527
+#: apt-get.8.xml:449
 msgid "<option>--default-release</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:450
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -3347,12 +3347,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:541
+#: apt-get.8.xml:463
 msgid "<option>--trivial-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:465
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -3361,24 +3361,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
+#: apt-get.8.xml:471
 msgid "<option>--no-remove</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:550
+#: apt-get.8.xml:472
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:477
 msgid "<option>--auto-remove</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:556
+#: apt-get.8.xml:478
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "
@@ -3387,12 +3387,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:562
+#: apt-get.8.xml:484
 msgid "<option>--only-source</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:563
+#: apt-get.8.xml:485
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -3404,22 +3404,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--diff-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--dsc-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--tar-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:574
+#: apt-get.8.xml:496
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -3427,24 +3427,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:579
+#: apt-get.8.xml:501
 msgid "<option>--arch-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:580
+#: apt-get.8.xml:502
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:584
+#: apt-get.8.xml:506
 msgid "<option>--allow-unauthenticated</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:585
+#: apt-get.8.xml:507
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -3452,14 +3452,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:598
+#: apt-get.8.xml:520
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:607
+#: apt-get.8.xml:529
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -3467,29 +3467,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:613
+#: apt-get.8.xml:535
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:616
+#: apt-get.8.xml:538
 msgid "ORIGINAL AUTHORS"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:617
+#: apt-get.8.xml:539
 msgid "&apt-author.jgunthorpe;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:620
+#: apt-get.8.xml:542
 msgid "CURRENT AUTHORS"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:622
+#: apt-get.8.xml:544
 msgid "&apt-author.team;"
 msgstr ""
 
@@ -3504,17 +3504,8 @@ msgstr "apt-get"
 msgid "APT key management utility"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-key.8.xml:31
-msgid ""
-"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
-"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
-"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
-"arg>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:40
+#: apt-key.8.xml:32
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -3522,87 +3513,87 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:46
+#: apt-key.8.xml:38
 msgid "Commands"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:48
-msgid "add <replaceable>filename</replaceable>"
+#: apt-key.8.xml:40
+msgid "add &synopsis-param-filename;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:44
 msgid ""
-"Add a new key to the list of trusted keys.  The key is read from "
-"<replaceable>filename</replaceable>, or standard input if "
-"<replaceable>filename</replaceable> is <literal>-</literal>."
+"Add a new key to the list of trusted keys.  The key is read from &synopsis-"
+"param-filename;, or standard input if &synopsis-param-filename; is <literal>-"
+"</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:60
-msgid "del <replaceable>keyid</replaceable>"
+#: apt-key.8.xml:52
+msgid "del &synopsis-param-keyid;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:64
+#: apt-key.8.xml:56
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:71
-msgid "export <replaceable>keyid</replaceable>"
+#: apt-key.8.xml:63
+msgid "export &synopsis-param-keyid;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:75
-msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+#: apt-key.8.xml:67
+msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:74
 msgid "exportall"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:86
+#: apt-key.8.xml:78
 msgid "Output all trusted keys to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:85
 msgid "list"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:97
+#: apt-key.8.xml:89
 msgid "List trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:96
 msgid "finger"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:108
+#: apt-key.8.xml:100
 msgid "List fingerprints of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:107
 msgid "adv"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:119
+#: apt-key.8.xml:111
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:131
+#: apt-key.8.xml:123
 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 "
@@ -3612,13 +3603,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:141
+#: apt-key.8.xml:133
 #, fuzzy
 msgid "net-update"
 msgstr "upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:137
 msgid ""
 "Work similar to the <command>update</command> command above, but get the "
 "archive keyring from an URI instead and validate it against a master key.  "
@@ -3629,19 +3620,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:154
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:164
-msgid "--keyring <replaceable>filename</replaceable>"
+#: apt-key.8.xml:156
+msgid "--keyring &synopsis-param-filename;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:165
+#: apt-key.8.xml:157
 msgid ""
 "With this option it is possible to specify a specific keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -3652,43 +3643,43 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:178
+#: apt-key.8.xml:170
 msgid "&file-trustedgpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:180
+#: apt-key.8.xml:172
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:173
 msgid "Local trust database of archive keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:184
+#: apt-key.8.xml:176
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:177
 msgid "Keyring of Debian archive trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:188
+#: apt-key.8.xml:180
 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:189
+#: apt-key.8.xml:181
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:198
+#: apt-key.8.xml:190
 msgid "&apt-get;, &apt-secure;"
 msgstr ""
 
@@ -3710,27 +3701,15 @@ msgstr ""
 msgid "mark/unmark a package as being automatically-installed"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-mark.8.xml:39
-msgid ""
-"  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
-"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
-"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> </group>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:39
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:61
+#: apt-mark.8.xml:43
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -3740,12 +3719,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:51
 msgid "auto"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:52
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -3753,12 +3732,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:59
 msgid "manual"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:78
+#: apt-mark.8.xml:60
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -3766,12 +3745,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:67
 msgid "hold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:68
 msgid ""
 "<literal>hold</literal> is used to mark a package as hold back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -3781,24 +3760,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:95
+#: apt-mark.8.xml:77
 msgid "unhold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:78
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:83
 msgid "showauto"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:102
+#: apt-mark.8.xml:84
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -3807,12 +3786,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:109
+#: apt-mark.8.xml:91
 msgid "showmanual"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:110
+#: apt-mark.8.xml:92
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -3820,32 +3799,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:116
+#: apt-mark.8.xml:98
 msgid "showhold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:99
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:130
+#: apt-mark.8.xml:112
 msgid ""
 "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:131
+#: apt-mark.8.xml:113
 msgid ""
 "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
 "option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:116
 msgid ""
 "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
 "filename> instead of the default location, which is "
@@ -3854,17 +3833,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:146
+#: apt-mark.8.xml:128
 msgid "  &file-extended_states;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:151
+#: apt-mark.8.xml:133
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:155
+#: apt-mark.8.xml:137
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -4107,17 +4086,8 @@ msgstr ""
 msgid "Utility to sort package index files"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-sortpkgs.1.xml:39
-msgid ""
-"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:48
+#: apt-sortpkgs.1.xml:39
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (Source index or "
 "Package index) and sort the records so that they are ordered by the package "
@@ -4126,24 +4096,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:54
+#: apt-sortpkgs.1.xml:45
 msgid "All output is sent to stdout, the input must be a seekable file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:61
+#: apt-sortpkgs.1.xml:52
 msgid "<option>--source</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:63
+#: apt-sortpkgs.1.xml:54
 msgid ""
 "Use Source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:77
+#: apt-sortpkgs.1.xml:68
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -4671,7 +4641,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:321 sources.list.5.xml:155
+#: apt.conf.5.xml:321 sources.list.5.xml:160
 msgid "http"
 msgstr ""
 
@@ -4775,7 +4745,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:387 sources.list.5.xml:166
+#: apt.conf.5.xml:387 sources.list.5.xml:171
 msgid "ftp"
 msgstr ""
 
@@ -4828,7 +4798,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426 sources.list.5.xml:148
+#: apt.conf.5.xml:426 sources.list.5.xml:153
 msgid "cdrom"
 msgstr ""
 
@@ -6956,8 +6926,19 @@ msgid ""
 "will be downloaded."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:121
+msgid ""
+"<literal>trusted=yes</literal> can be set to indicate that packages from "
+"this source are always authenificated even if the <filename>Release</"
+"filename> file is not signed or the signature can't be checked. This "
+"disables parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context. <literal>trusted=no</literal> is the opposite which "
+"handles even correctly authenificated sources as not authenificated."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:123
+#: sources.list.5.xml:128
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -6966,12 +6947,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:128
+#: sources.list.5.xml:133
 msgid "Some examples:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:135
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -6980,17 +6961,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:141
 msgid "URI specification"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:146
 msgid "file"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:143
+#: sources.list.5.xml:148
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6998,14 +6979,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:150
+#: sources.list.5.xml:155
 msgid ""
 "The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:157
+#: sources.list.5.xml:162
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -7016,7 +6997,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:173
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
@@ -7028,12 +7009,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:177
+#: sources.list.5.xml:182
 msgid "copy"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:179
+#: sources.list.5.xml:184
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -7041,17 +7022,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
 msgid "rsh"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
 msgid "ssh"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:186
+#: sources.list.5.xml:191
 msgid ""
 "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
 "user and access the files. It is a good idea to do prior arrangements with "
@@ -7061,12 +7042,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:199
 msgid "more recognizable URI types"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:196
+#: sources.list.5.xml:201
 msgid ""
 "APT can be extended with more methods shipped in other optional packages "
 "which should follow the nameing scheme <literal>apt-transport-"
@@ -7079,49 +7060,49 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:138
+#: sources.list.5.xml:143
 msgid ""
 "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
 "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:215
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:217
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:214
+#: sources.list.5.xml:219
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:220
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:222
 msgid "Source line for the above"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:223
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:225
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7129,7 +7110,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:227
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7137,33 +7118,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:230
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
+#: sources.list.5.xml:232
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:229
+#: sources.list.5.xml:234
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:231
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:238
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7172,19 +7153,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:246
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:244
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7196,7 +7177,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:256
 msgid "&apt-cache; &apt-conf;"
 msgstr ""
 
diff --git a/doc/po/ja.po b/doc/po/ja.po
index cd170cca3..66053e454 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
-"POT-Creation-Date: 2011-11-20 17:58+0100\n"
+"POT-Creation-Date: 2012-04-11 17:54+0300\n"
 "PO-Revision-Date: 2010-09-07 07:38+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -655,7 +655,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:210
+#: apt.ent:211
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -680,6 +680,101 @@ msgstr ""
 "     内容を失わないようにこのようにしています。\n"
 "\">\n"
 
+#. type: Plain text
+#: apt.ent:214
+msgid ""
+"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
+"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:217
+msgid ""
+"<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+"synopsis-config-file \"config_file\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:220
+msgid ""
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
+"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"\"target_release\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:223
+msgid ""
+"<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+"synopsis-architecture \"architecture\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:226
+msgid ""
+"<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+"--> <!ENTITY synopsis-pkg \"pkg\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:229
+msgid ""
+"<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
+"ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:232
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+"pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:235
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+"awesome --> <!ENTITY synopsis-regex \"regex\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:238
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
+"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:241
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
+"apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+"\"temporary_directory\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:244
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+"synopsis-filename \"filename\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:250
+msgid ""
+"<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive "
+"packages path override pathprefix --> <!ENTITY synopsis-path \"path\"> <!"
+"ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section "
+"\"section\"> <!ENTITY synopsis-override \"override\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:253
+msgid ""
+"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+msgstr ""
+
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:16
@@ -720,87 +815,19 @@ msgstr "APT"
 msgid "query the APT cache"
 msgstr ""
 
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cache.8.xml:39
-#, fuzzy
-#| msgid ""
-#| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
-#| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
-#| "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
-#| "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice="
-#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#| "<arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice="
-#| "\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#| "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
-#| "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
-#| "group>"
-msgid ""
-"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
-"<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
-"arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></arg></"
-"arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>policy <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></"
-"arg> </group>"
-msgstr ""
-"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>add <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
-"replaceable></arg></arg> <arg>gencaches</arg> <arg>showpkg <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>showsrc <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</"
-"arg> <arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</"
-"replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>depends <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
-"\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </group>"
-
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
-#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121
-#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
-#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
+#: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38
+#: apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38
+#: apt-key.8.xml:30 apt-mark.8.xml:38 apt-secure.8.xml:43
+#: apt-sortpkgs.1.xml:38 apt.conf.5.xml:42 apt_preferences.5.xml:36
 #: sources.list.5.xml:36
 msgid "Description"
 msgstr "説明"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:65
+#: apt-cache.8.xml:39
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -814,7 +841,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:70 apt-get.8.xml:127
+#: apt-cache.8.xml:44 apt-get.8.xml:44
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -823,13 +850,13 @@ msgstr ""
 "下に挙げるコマンドが必要です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:74
+#: apt-cache.8.xml:48
 msgid "gencaches"
 msgstr "gencaches"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:75
+#: apt-cache.8.xml:49
 msgid ""
 "<literal>gencaches</literal> performs the same operation as <command>apt-get "
 "check</command>. It builds the source and package caches from the sources in "
@@ -841,13 +868,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:81
+#: apt-cache.8.xml:55
 msgid "showpkg <replaceable>pkg(s)</replaceable>"
 msgstr "showpkg <replaceable>pkg(s)</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:82
+#: apt-cache.8.xml:56
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -870,7 +897,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:94
+#: apt-cache.8.xml:68
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -898,7 +925,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:106
+#: apt-cache.8.xml:80
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -917,13 +944,13 @@ msgstr ""
 "apt のソースコードを調べるのが最良でしょう。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:89
 msgid "stats"
 msgstr "stats"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:89
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -933,7 +960,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:118
+#: apt-cache.8.xml:92
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -943,7 +970,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:122
+#: apt-cache.8.xml:96
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -956,7 +983,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:128
+#: apt-cache.8.xml:102
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -974,7 +1001,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:136
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -988,7 +1015,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:142
+#: apt-cache.8.xml:116
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -1002,7 +1029,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:149
+#: apt-cache.8.xml:123
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -1018,7 +1045,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:130
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache; this value is therefore at least equal to the number of "
@@ -1033,7 +1060,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:163
+#: apt-cache.8.xml:137
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -1043,13 +1070,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:170
+#: apt-cache.8.xml:144
 msgid "showsrc <replaceable>pkg(s)</replaceable>"
 msgstr "showsrc <replaceable>pkg(s)</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -1060,13 +1087,13 @@ msgstr ""
 "べてのバージョンについて表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:176 apt-config.8.xml:87
+#: apt-cache.8.xml:150 apt-config.8.xml:75
 msgid "dump"
 msgstr "dump"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:151
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -1075,13 +1102,13 @@ msgstr ""
 "覧を表示します。主にデバッグ用です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:181
+#: apt-cache.8.xml:155
 msgid "dumpavail"
 msgstr "dumpavail"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:156
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
@@ -1090,13 +1117,13 @@ msgstr ""
 "す。 &dpkg; と共に使用すると便利ですし、&dselect; でも使用されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:186
+#: apt-cache.8.xml:160
 msgid "unmet"
 msgstr "unmet"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:161
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -1106,13 +1133,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml:165
 msgid "show <replaceable>pkg(s)</replaceable>"
 msgstr "show <replaceable>pkg(s)</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -1121,13 +1148,13 @@ msgstr ""
 "能を実行します。これは、指定したパッケージのパッケージレコードの表示です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:171
 msgid "search <replaceable>regex [ regex ... ]</replaceable>"
 msgstr "search <replaceable>regex [ regex ... ]</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:172
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see "
@@ -1152,7 +1179,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:211
+#: apt-cache.8.xml:185
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -1160,13 +1187,13 @@ msgstr "空白で区切った引数で、複数の検索パターンの and を�
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:215
+#: apt-cache.8.xml:189
 msgid "depends <replaceable>pkg(s)</replaceable>"
 msgstr "depends <replaceable>pkg(s)</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:216
+#: apt-cache.8.xml:190
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -1176,13 +1203,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:220
+#: apt-cache.8.xml:194
 msgid "rdepends <replaceable>pkg(s)</replaceable>"
 msgstr "rdepends <replaceable>pkg(s)</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:195
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -1191,13 +1218,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:225
+#: apt-cache.8.xml:199
 msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
 msgstr "pkgnames <replaceable>[ prefix ]</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml:200
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -1211,7 +1238,7 @@ msgstr ""
 "generate</option> オプションと共に使用すると非常に便利です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:205
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -1223,13 +1250,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:236
+#: apt-cache.8.xml:210
 msgid "dotty <replaceable>pkg(s)</replaceable>"
 msgstr "dotty <replaceable>pkg(s)</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:237
+#: apt-cache.8.xml:211
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1249,7 +1276,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:246
+#: apt-cache.8.xml:220
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -1263,18 +1290,18 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:251
+#: apt-cache.8.xml:225
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr "注意) dotty は、パッケージのより大きなセットのグラフは描けません。"
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
+#: apt-cache.8.xml:228
 msgid "xvcg <replaceable>pkg(s)</replaceable>"
 msgstr "xvcg <replaceable>pkg(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:229
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -1284,13 +1311,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:259
+#: apt-cache.8.xml:233
 msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
 msgstr "policy <replaceable>[ pkg(s) ]</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:260
+#: apt-cache.8.xml:234
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -1303,13 +1330,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:266
+#: apt-cache.8.xml:240
 msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
 msgstr "madison <replaceable>[ pkg(s) ]</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:267
+#: apt-cache.8.xml:241
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -1328,25 +1355,25 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126
-#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
+#: apt-cache.8.xml:252 apt-config.8.xml:84 apt-extracttemplates.1.xml:51
+#: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
+#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:577 apt.conf.5.xml:599
 msgid "options"
 msgstr "オプション"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:256
 msgid "<option>-p</option>"
 msgstr "<option>-p</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:256
 msgid "<option>--pkg-cache</option>"
 msgstr "<option>--pkg-cache</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:283
+#: apt-cache.8.xml:257
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -1357,19 +1384,19 @@ msgstr ""
 "pkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404
-#: apt-sortpkgs.1.xml:61
+#: apt-cache.8.xml:262 apt-ftparchive.1.xml:551 apt-get.8.xml:321
+#: apt-sortpkgs.1.xml:52
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
+#: apt-cache.8.xml:262
 msgid "<option>--src-cache</option>"
 msgstr "<option>--src-cache</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:263
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1384,18 +1411,18 @@ msgstr ""
 "<literal>Dir::Cache::srcpkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
+#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
+#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:271
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1408,18 +1435,18 @@ msgstr ""
 "<literal>quiet</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:277
 msgid "<option>-i</option>"
 msgstr "<option>-i</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:277
 msgid "<option>--important</option>"
 msgstr "<option>--important</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:304
+#: apt-cache.8.xml:278
 msgid ""
 "Print only important dependencies; for use with unmet and depends. Causes "
 "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
@@ -1430,48 +1457,48 @@ msgstr ""
 "Cache::Important</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
+#: apt-cache.8.xml:283
 msgid "<option>--no-pre-depends</option>"
 msgstr "<option>--no-pre-depends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:284
 msgid "<option>--no-depends</option>"
 msgstr "<option>--no-depends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:285
 msgid "<option>--no-recommends</option>"
 msgstr "<option>--no-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:286
 msgid "<option>--no-suggests</option>"
 msgstr "<option>--no-suggests</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:287
 msgid "<option>--no-conflicts</option>"
 msgstr "<option>--no-conflicts</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:314
+#: apt-cache.8.xml:288
 msgid "<option>--no-breaks</option>"
 msgstr "<option>--no-breaks</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315
+#: apt-cache.8.xml:289
 msgid "<option>--no-replaces</option>"
 msgstr "<option>--no-replaces</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:290
 msgid "<option>--no-enhances</option>"
 msgstr "<option>--no-enhances</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:291
 #, fuzzy
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
@@ -1485,18 +1512,18 @@ msgstr ""
 "RecurseDepends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
+#: apt-cache.8.xml:297 apt-cdrom.8.xml:111 apt-get.8.xml:278
 msgid "<option>-f</option>"
 msgstr "<option>-f</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323
+#: apt-cache.8.xml:297
 msgid "<option>--full</option>"
 msgstr "<option>--full</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:324
+#: apt-cache.8.xml:298
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -1505,19 +1532,19 @@ msgstr ""
 "ShowFull</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
-#: apt-get.8.xml:447
+#: apt-cache.8.xml:302 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563
+#: apt-get.8.xml:369
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:302
 msgid "<option>--all-versions</option>"
 msgstr "<option>--all-versions</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:303
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -1533,18 +1560,18 @@ msgstr ""
 "用できます。設定項目 - <literal>APT::Cache::AllVersions</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:311
 msgid "<option>-g</option>"
 msgstr "<option>-g</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:311
 msgid "<option>--generate</option>"
 msgstr "<option>--generate</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:312
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1556,18 +1583,18 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:317
 msgid "<option>--names-only</option>"
 msgstr "<option>--names-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343 apt-cdrom.8.xml:142
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:129
 msgid "<option>-n</option>"
 msgstr "<option>-n</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:318
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1576,13 +1603,13 @@ msgstr ""
 "Cache::NamesOnly</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:348
+#: apt-cache.8.xml:322
 msgid "<option>--all-names</option>"
 msgstr "<option>--all-names</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:323
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -1592,13 +1619,13 @@ msgstr ""
 "表示します。設定項目 - <literal>APT::Cache::AllNames</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:354
+#: apt-cache.8.xml:328
 msgid "<option>--recurse</option>"
 msgstr "<option>--recurse</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:355
+#: apt-cache.8.xml:329
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1609,13 +1636,13 @@ msgstr ""
 "RecurseDepends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:360
+#: apt-cache.8.xml:334
 msgid "<option>--installed</option>"
 msgstr "<option>--installed</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:362
+#: apt-cache.8.xml:336
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -1627,51 +1654,51 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:591
-#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89
+#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513
+#: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:596 apt-key.8.xml:175 apt-mark.8.xml:144
+#: apt-cache.8.xml:346 apt-get.8.xml:518 apt-key.8.xml:167 apt-mark.8.xml:126
 #: apt.conf.5.xml:1110 apt_preferences.5.xml:697
 msgid "Files"
 msgstr "ファイル"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:348
 msgid "&file-sourceslist; &file-statelists;"
 msgstr "&file-sourceslist; &file-statelists;"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:606
-#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704
-#: sources.list.5.xml:250
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94
+#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528
+#: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704
+#: sources.list.5.xml:255
 msgid "See Also"
 msgstr "関連項目"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:380
+#: apt-cache.8.xml:354
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:612
-#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99
+#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534
+#: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr "診断メッセージ"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:385
+#: apt-cache.8.xml:359
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1700,25 +1727,9 @@ msgstr "apt-cdrom"
 msgid "APT CDROM management utility"
 msgstr "APT CDROM 管理ユーティリティ"
 
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cdrom.8.xml:38
-msgid ""
-"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
-"<arg>add</arg> <arg>ident</arg> </group>"
-msgstr ""
-"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
-"<arg>add</arg> <arg>ident</arg> </group>"
-
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
+#: apt-cdrom.8.xml:38
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -1732,7 +1743,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:45
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
@@ -1743,12 +1754,12 @@ msgstr ""
 "補正できるか評価しなければなりません。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:68
+#: apt-cdrom.8.xml:55
 msgid "add"
 msgstr "add"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:69
+#: apt-cdrom.8.xml:56
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@ -1763,7 +1774,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:77
+#: apt-cdrom.8.xml:64
 msgid ""
 "APT uses a CDROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -1774,13 +1785,13 @@ msgstr ""
 "ベースで管理します。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:84
+#: apt-cdrom.8.xml:71
 msgid "ident"
 msgstr "ident"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:85
+#: apt-cdrom.8.xml:72
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -1790,7 +1801,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:64
+#: apt-cdrom.8.xml:51
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present.  <placeholder type=\"variablelist"
@@ -1801,23 +1812,23 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:161
+#: apt-cdrom.8.xml:81 apt-key.8.xml:153
 msgid "Options"
 msgstr "オプション"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
+#: apt-cdrom.8.xml:85 apt-ftparchive.1.xml:519 apt-get.8.xml:273
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98
+#: apt-cdrom.8.xml:85
 msgid "<option>--cdrom</option>"
 msgstr "<option>--cdrom</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:99
+#: apt-cdrom.8.xml:86
 msgid ""
 "Mount point; specify the location to mount the cdrom. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -1828,18 +1839,18 @@ msgstr ""
 "定項目 - <literal>Acquire::cdrom::mount</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
+#: apt-cdrom.8.xml:94
 msgid "<option>-r</option>"
 msgstr "<option>-r</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
+#: apt-cdrom.8.xml:94
 msgid "<option>--rename</option>"
 msgstr "<option>--rename</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:108
+#: apt-cdrom.8.xml:95
 msgid ""
 "Rename a disc; change the label of a disk or override the disks given label. "
 "This option will cause <command>apt-cdrom</command> to prompt for a new "
@@ -1850,18 +1861,18 @@ msgstr ""
 "ます。設定項目 - <literal>APT::CDROM::Rename</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116 apt-get.8.xml:375
+#: apt-cdrom.8.xml:103 apt-get.8.xml:292
 msgid "<option>-m</option>"
 msgstr "<option>-m</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116
+#: apt-cdrom.8.xml:103
 msgid "<option>--no-mount</option>"
 msgstr "<option>--no-mount</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:117
+#: apt-cdrom.8.xml:104
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -1872,13 +1883,13 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:124
+#: apt-cdrom.8.xml:111
 msgid "<option>--fast</option>"
 msgstr "<option>--fast</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:125
+#: apt-cdrom.8.xml:112
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1891,13 +1902,13 @@ msgstr ""
 "<literal>APT::CDROM::Fast</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:134
+#: apt-cdrom.8.xml:121
 msgid "<option>--thorough</option>"
 msgstr "<option>--thorough</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:135
+#: apt-cdrom.8.xml:122
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1909,23 +1920,23 @@ msgstr ""
 "できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:143 apt-get.8.xml:406
+#: apt-cdrom.8.xml:130 apt-get.8.xml:323
 msgid "<option>--just-print</option>"
 msgstr "<option>--just-print</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:144 apt-get.8.xml:408
+#: apt-cdrom.8.xml:131 apt-get.8.xml:325
 msgid "<option>--recon</option>"
 msgstr "<option>--recon</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:145 apt-get.8.xml:409
+#: apt-cdrom.8.xml:132 apt-get.8.xml:326
 msgid "<option>--no-act</option>"
 msgstr "<option>--no-act</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:133
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -1937,13 +1948,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:159
+#: apt-cdrom.8.xml:146
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:164
+#: apt-cdrom.8.xml:151
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1974,23 +1985,9 @@ msgstr "apt-config"
 msgid "APT Configuration Query program"
 msgstr "APT 設定取得プログラム"
 
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-config.8.xml:39
-msgid ""
-"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>shell</arg> <arg>dump</arg> </group>"
-msgstr ""
-"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>shell</arg> <arg>dump</arg> </group>"
-
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:51
+#: apt-config.8.xml:39
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -2004,7 +2001,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:56 apt-ftparchive.1.xml:75
+#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present."
@@ -2013,13 +2010,13 @@ msgstr ""
 "下に挙げるコマンドが必要です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:49
 msgid "shell"
 msgstr "shell"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:63
+#: apt-config.8.xml:51
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
@@ -2034,7 +2031,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:71
+#: apt-config.8.xml:59
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -2048,7 +2045,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:76
+#: apt-config.8.xml:64
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -2058,7 +2055,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:80
+#: apt-config.8.xml:68
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -2070,20 +2067,20 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:89
+#: apt-config.8.xml:77
 msgid "Just show the contents of the configuration space."
 msgstr "設定箇所の内容を表示するだけです。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
-#: apt-sortpkgs.1.xml:73
+#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112
+#: apt-config.8.xml:100
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2110,23 +2107,9 @@ msgstr ""
 "Debian パッケージから DebConf 設定と DebConf テンプレートを抽出するユーティリ"
 "ティ"
 
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-extracttemplates.1.xml:39
-msgid ""
-"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-"<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
-"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
-"arg>"
-msgstr ""
-"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-"<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
-"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
-"arg>"
-
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:39
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -2141,13 +2124,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:52
+#: apt-extracttemplates.1.xml:44
 msgid "package version template-file config-script"
 msgstr "package version template-file config-script"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:53
+#: apt-extracttemplates.1.xml:45
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
@@ -2160,18 +2143,18 @@ msgstr ""
 "<filename>package.config.XXXX</filename> と言った形になります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63 apt-get.8.xml:525
+#: apt-extracttemplates.1.xml:55 apt-get.8.xml:447
 msgid "<option>-t</option>"
 msgstr "<option>-t</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63
+#: apt-extracttemplates.1.xml:55
 msgid "<option>--tempdir</option>"
 msgstr "<option>--tempdir</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:65
+#: apt-extracttemplates.1.xml:57
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@ -2182,7 +2165,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:82
+#: apt-extracttemplates.1.xml:74
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -2212,51 +2195,9 @@ msgstr "apt-ftparchive"
 msgid "Utility to generate index files"
 msgstr "インデックスファイル生成ユーティリティ"
 
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-ftparchive.1.xml:39
-msgid ""
-"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
-"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
-"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
-"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-"replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
-"arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
-"arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
-"replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
-"\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
-msgstr ""
-"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
-"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
-"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
-"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-"replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
-"arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
-"arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
-"replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
-"\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
-
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -2269,7 +2210,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:64
+#: apt-ftparchive.1.xml:43
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -2284,7 +2225,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:70
+#: apt-ftparchive.1.xml:49
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -2299,13 +2240,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:79
+#: apt-ftparchive.1.xml:58
 msgid "packages"
 msgstr "packages"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:81
+#: apt-ftparchive.1.xml:60
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -2319,20 +2260,20 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
+#: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr "<option>--db</option> オプションで、キャッシュ DB を指定できます。"
 
 # type: Content of: <refentry><refnamediv><refname>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:89
+#: apt-ftparchive.1.xml:68
 msgid "sources"
 msgstr "sources"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:70
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -2346,7 +2287,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:75
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -2357,13 +2298,13 @@ msgstr ""
 "override オプションを使用します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:101
+#: apt-ftparchive.1.xml:80
 msgid "contents"
 msgstr "contents"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:103
+#: apt-ftparchive.1.xml:82
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -2380,12 +2321,12 @@ msgstr ""
 "で出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:113
+#: apt-ftparchive.1.xml:92
 msgid "release"
 msgstr "release"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:115
+#: apt-ftparchive.1.xml:94
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -2400,7 +2341,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:125
+#: apt-ftparchive.1.xml:104
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -2420,13 +2361,13 @@ msgstr ""
 "<literal>Components</literal>, <literal>Description</literal> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:115
 msgid "generate"
 msgstr "generate"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:138
+#: apt-ftparchive.1.xml:117
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -2440,13 +2381,13 @@ msgstr ""
 "のディレクトリから作成するかを指定する、柔軟な方法を提供します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
+#: apt-ftparchive.1.xml:124 apt-get.8.xml:215
 msgid "clean"
 msgstr "clean"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:126
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -2456,13 +2397,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:153
+#: apt-ftparchive.1.xml:132
 msgid "The Generate Configuration"
 msgstr "Generate 設定"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:134
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -2480,7 +2421,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:163
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
@@ -2489,13 +2430,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:144
 msgid "Dir Section"
 msgstr "Dir セクション"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:146
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -2508,13 +2449,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:151
 msgid "ArchiveDir"
 msgstr "ArchiveDir"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:153
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2524,36 +2465,36 @@ msgstr ""
 "リには <filename>ls-LR</filename> と dist ノードがあります。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:179
+#: apt-ftparchive.1.xml:158
 msgid "OverrideDir"
 msgstr "OverrideDir"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:160
 msgid "Specifies the location of the override files."
 msgstr "オーバーライドファイルの場所を指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:184
+#: apt-ftparchive.1.xml:163
 msgid "CacheDir"
 msgstr "CacheDir"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:165
 msgid "Specifies the location of the cache files"
 msgstr "キャッシュファイルの場所を指定します。"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:189
+#: apt-ftparchive.1.xml:168
 msgid "FileListDir"
 msgstr "FileListDir"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:170
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -2563,13 +2504,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:176
 msgid "Default Section"
 msgstr "Default セクション"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:199
+#: apt-ftparchive.1.xml:178
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -2581,13 +2522,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
+#: apt-ftparchive.1.xml:182
 msgid "Packages::Compress"
 msgstr "Packages::Compress"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:184
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -2599,13 +2540,13 @@ msgstr ""
 "法のデフォルトはすべて '. gzip' です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:190
 msgid "Packages::Extensions"
 msgstr "Packages::Extensions"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:213
+#: apt-ftparchive.1.xml:192
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -2614,13 +2555,13 @@ msgstr ""
 "deb' です。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:196
 msgid "Sources::Compress"
 msgstr "Sources::Compress"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:219
+#: apt-ftparchive.1.xml:198
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -2629,13 +2570,13 @@ msgstr ""
 "指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:202
 msgid "Sources::Extensions"
 msgstr "Sources::Extensions"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:225
+#: apt-ftparchive.1.xml:204
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -2644,13 +2585,13 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:208
 msgid "Contents::Compress"
 msgstr "Contents::Compress"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:210
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -2659,12 +2600,12 @@ msgstr ""
 "指定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:214
 msgid "Translation::Compress"
 msgstr "Translation::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:237
+#: apt-ftparchive.1.xml:216
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
@@ -2673,13 +2614,13 @@ msgstr ""
 "ルの圧縮を制御します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
+#: apt-ftparchive.1.xml:220
 msgid "DeLinkLimit"
 msgstr "DeLinkLimit"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:222
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -2691,13 +2632,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248
+#: apt-ftparchive.1.xml:227
 msgid "FileMode"
 msgstr "FileMode"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:229
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
@@ -2707,12 +2648,12 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
+#: apt-ftparchive.1.xml:234 apt-ftparchive.1.xml:380
 msgid "LongDescription"
 msgstr "LongDescription"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+#: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
@@ -2720,13 +2661,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:263
+#: apt-ftparchive.1.xml:242
 msgid "TreeDefault Section"
 msgstr "TreeDefault セクション"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml:244
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -2737,13 +2678,13 @@ msgstr ""
 "に展開します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:249
 msgid "MaxContentsChange"
 msgstr "MaxContentsChange"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:272
+#: apt-ftparchive.1.xml:251
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -2754,13 +2695,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:256
 msgid "ContentsAge"
 msgstr "ContentsAge"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:279
+#: apt-ftparchive.1.xml:258
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -2777,13 +2718,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:267
 msgid "Directory"
 msgstr "Directory"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:290
+#: apt-ftparchive.1.xml:269
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -2793,13 +2734,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:273
 msgid "SrcDirectory"
 msgstr "SrcDirectory"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:296
+#: apt-ftparchive.1.xml:275
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -2809,13 +2750,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:418
 msgid "Packages"
 msgstr "Packages"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:281
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -2825,13 +2766,13 @@ msgstr ""
 
 # type: Content of: <refentry><refnamediv><refname>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:306 apt-ftparchive.1.xml:444
+#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:423
 msgid "Sources"
 msgstr "Sources"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:287
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -2841,12 +2782,12 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
+#: apt-ftparchive.1.xml:291
 msgid "Translation"
 msgstr "Translation"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:293
 msgid ""
 "Set the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
@@ -2854,13 +2795,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319
+#: apt-ftparchive.1.xml:298
 msgid "InternalPrefix"
 msgstr "InternalPrefix"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:300
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -2871,13 +2812,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:305 apt-ftparchive.1.xml:429
 msgid "Contents"
 msgstr "Contents"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:307
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
@@ -2890,24 +2831,24 @@ msgstr ""
 "ftparchive</command> は自動でパッケージファイルをまとめます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:314
 msgid "Contents::Header"
 msgstr "Contents::Header"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:316
 msgid "Sets header file to prepend to the contents output."
 msgstr "contents の出力に付けるヘッダファイルを設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:340 apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:454
 msgid "BinCacheDB"
 msgstr "BinCacheDB"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:342
+#: apt-ftparchive.1.xml:321
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -2917,13 +2858,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:325
 msgid "FileList"
 msgstr "FileList"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:327
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -2935,13 +2876,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:353
+#: apt-ftparchive.1.xml:332
 msgid "SourceFileList"
 msgstr "SourceFileList"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:355
+#: apt-ftparchive.1.xml:334
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -2954,13 +2895,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:342
 msgid "Tree Section"
 msgstr "Tree セクション"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:365
+#: apt-ftparchive.1.xml:344
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -2974,7 +2915,7 @@ msgstr ""
 "<literal>Directory</literal> 変数で定義されます。"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:349
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -2988,7 +2929,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:375
+#: apt-ftparchive.1.xml:354
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
@@ -2999,7 +2940,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:381
+#: apt-ftparchive.1.xml:360
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -3014,7 +2955,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><para><informalexample>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:378
+#: apt-ftparchive.1.xml:357
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -3026,13 +2967,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
+#: apt-ftparchive.1.xml:366
 msgid "Sections"
 msgstr "Sections"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389
+#: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"
@@ -3043,13 +2984,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
+#: apt-ftparchive.1.xml:373 apt.conf.5.xml:157
 msgid "Architectures"
 msgstr "Architectures"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:375
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -3061,13 +3002,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:434
 msgid "BinOverride"
 msgstr "BinOverride"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:388
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -3077,13 +3018,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:439
 msgid "SrcOverride"
 msgstr "SrcOverride"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:415
+#: apt-ftparchive.1.xml:394
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -3093,37 +3034,37 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
+#: apt-ftparchive.1.xml:398 apt-ftparchive.1.xml:444
 msgid "ExtraOverride"
 msgstr "ExtraOverride"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
 msgid "Sets the binary extra override file."
 msgstr "バイナリ特別オーバーライドファイルを設定します。"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:424 apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:403 apt-ftparchive.1.xml:449
 msgid "SrcExtraOverride"
 msgstr "SrcExtraOverride"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
+#: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
 msgid "Sets the source extra override file."
 msgstr "ソース特別オーバーライドファイルを設定します。"
 
 # type: Content of: <refentry><refsect1><refsect2><title>
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:431
+#: apt-ftparchive.1.xml:410
 msgid "BinDirectory Section"
 msgstr "BinDirectory セクション"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:412
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -3138,13 +3079,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:441
+#: apt-ftparchive.1.xml:420
 msgid "Sets the Packages file output."
 msgstr "Packages ファイルの出力先を設定します。"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:446
+#: apt-ftparchive.1.xml:425
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -3154,59 +3095,59 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml:431
 msgid "Sets the Contents file output. (optional)"
 msgstr "Contents ファイルの出力先を設定します。(オプション)"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:457
+#: apt-ftparchive.1.xml:436
 msgid "Sets the binary override file."
 msgstr "バイナリオーバーライドファイルを設定します。"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:441
 msgid "Sets the source override file."
 msgstr "ソースオーバーライドファイルを設定します。"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:477
+#: apt-ftparchive.1.xml:456
 msgid "Sets the cache DB."
 msgstr "キャッシュ DB を設定します。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:459
 msgid "PathPrefix"
 msgstr "PathPrefix"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:461
 msgid "Appends a path to all the output paths."
 msgstr "全出力パスに付加するパス。"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:464
 msgid "FileList, SourceFileList"
 msgstr "FileList, SourceFileList"
 
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:466
 msgid "Specifies the file list file."
 msgstr "ファイル一覧ファイルを指定します。"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:473
 msgid "The Binary Override File"
 msgstr "バイナリオーバーライドファイル"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:495
+#: apt-ftparchive.1.xml:474
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -3221,20 +3162,20 @@ msgstr ""
 "す。"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:480
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:482
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:500
+#: apt-ftparchive.1.xml:479
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3252,13 +3193,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:490
 msgid "The Source Override File"
 msgstr "ソースオーバーライドファイル"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:513
+#: apt-ftparchive.1.xml:492
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -3270,13 +3211,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:497
 msgid "The Extra Override File"
 msgstr "特別オーバーライドファイル"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:520
+#: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -3286,13 +3227,23 @@ msgstr ""
 "す。3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:508
 msgid ""
 "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml:510
+#, fuzzy
+#| msgid ""
+#| "Values for the additional metadata fields in the Release file are taken "
+#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
+#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
+#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
+#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
+#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-"
+#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</"
+#| "literal>, <literal>Description</literal>."
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -3304,15 +3255,22 @@ msgid ""
 "literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
 "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
 msgstr ""
+"Release ファイルの追加メタデータフィールドの値は、<literal>APT::FTPArchive::"
+"Release</literal> 以下の相当する値 (例: <literal>APT::FTPArchive::Release::"
+"Origin</literal>) をとります。サポートするフィールドは、<literal>Origin</"
+"literal>, <literal>Label</literal>, <literal>Suite</literal>, "
+"<literal>Version</literal>, <literal>Codename</literal>, <literal>Date</"
+"literal>, <literal>Valid-Until</literal>, <literal>Architectures</literal>, "
+"<literal>Components</literal>, <literal>Description</literal> です。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:540
+#: apt-ftparchive.1.xml:519
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:521
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3322,7 +3280,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:548
+#: apt-ftparchive.1.xml:527
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3335,13 +3293,13 @@ msgstr ""
 "<literal>quiet</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:554
+#: apt-ftparchive.1.xml:533
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:556
+#: apt-ftparchive.1.xml:535
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3354,13 +3312,13 @@ msgstr ""
 "<literal>APT::FTPArchive::DeLinkAct</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:562
+#: apt-ftparchive.1.xml:541
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:564
+#: apt-ftparchive.1.xml:543
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3375,13 +3333,13 @@ msgstr ""
 "<literal>APT::FTPArchive::Contents</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:572
+#: apt-ftparchive.1.xml:551
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:553
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3391,13 +3349,13 @@ msgstr ""
 "選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:578
+#: apt-ftparchive.1.xml:557
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:559
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3406,13 +3364,13 @@ msgstr ""
 "FTPArchive::ReadOnlyDB</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:584
+#: apt-ftparchive.1.xml:563
 msgid "<option>--arch</option>"
 msgstr "<option>--arch</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:585
+#: apt-ftparchive.1.xml:564
 #, fuzzy
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
@@ -3426,12 +3384,12 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:591
+#: apt-ftparchive.1.xml:570
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>--version</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:593
+#: apt-ftparchive.1.xml:572
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3445,12 +3403,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:603
+#: apt-ftparchive.1.xml:582
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:605
+#: apt-ftparchive.1.xml:584
 #, fuzzy
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
@@ -3466,14 +3424,14 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544
-#: sources.list.5.xml:209
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1104 apt_preferences.5.xml:544
+#: sources.list.5.xml:214
 msgid "Examples"
 msgstr "サンプル"
 
 # type: Content of: <refentry><refsect1><para><programlisting>
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:623
+#: apt-ftparchive.1.xml:602
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr ""
@@ -3482,7 +3440,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:619
+#: apt-ftparchive.1.xml:598
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3492,7 +3450,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:633
+#: apt-ftparchive.1.xml:612
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3522,95 +3480,8 @@ msgstr "apt-get"
 msgid "APT package handling utility -- command-line interface"
 msgstr "APT パッケージ操作ユーティリティ -- コマンドラインインターフェース"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-get.8.xml:39
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
-#| "<arg> <option>-t=</option> <arg choice='plain'> "
-#| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
-#| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
-#| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
-#| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
-#| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-#| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-#| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
-#| "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#| "<group choice='req'> <arg choice='plain'> "
-#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#| "help</arg> </group> </arg> </group>"
-msgid ""
-"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
-"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
-"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
-"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> "
-"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice="
-"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
-"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
-"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
-"arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
-"<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-"<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
-"</group> </arg> </group>"
-msgstr ""
-"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
-"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
-"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
-"replaceable> </arg> </arg> <group choice=\"req\"> <arg "
-"choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
-"choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
-"<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
-"arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
-"<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-"<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
-"</group> </arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:122
+#: apt-get.8.xml:39
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
@@ -3623,13 +3494,13 @@ msgstr ""
 "&wajig; などがあります。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:131 apt-key.8.xml:127
+#: apt-get.8.xml:48 apt-key.8.xml:119
 msgid "update"
 msgstr "update"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:132
+#: apt-get.8.xml:49
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -3652,13 +3523,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: <tag></tag>
-#: apt-get.8.xml:143 guide.sgml:121
+#: apt-get.8.xml:60 guide.sgml:121
 msgid "upgrade"
 msgstr "upgrade"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:144
+#: apt-get.8.xml:61
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -3682,13 +3553,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:156
+#: apt-get.8.xml:73
 msgid "dselect-upgrade"
 msgstr "dselect-upgrade"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:157
+#: apt-get.8.xml:74
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -3706,13 +3577,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: <tag></tag>
-#: apt-get.8.xml:166 guide.sgml:140
+#: apt-get.8.xml:83 guide.sgml:140
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:167
+#: apt-get.8.xml:84
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3736,13 +3607,13 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: <tag></tag>
-#: apt-get.8.xml:179 guide.sgml:131
+#: apt-get.8.xml:96 guide.sgml:131
 msgid "install"
 msgstr "install"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:181
+#: apt-get.8.xml:98
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -3769,7 +3640,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:116
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -3787,7 +3658,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:123
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -3796,7 +3667,7 @@ msgstr ""
 "なりません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:209
+#: apt-get.8.xml:126
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -3816,7 +3687,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:220
+#: apt-get.8.xml:137
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -3826,7 +3697,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:141
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -3843,13 +3714,13 @@ msgstr ""
 "ば、'^' や '$' を付けるか、もっと詳しい正規表現を指定してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:233
+#: apt-get.8.xml:150
 msgid "remove"
 msgstr "remove"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:151
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -3864,13 +3735,13 @@ msgstr ""
 "トールします。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:241
+#: apt-get.8.xml:158
 msgid "purge"
 msgstr "purge"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:242
+#: apt-get.8.xml:159
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -3881,13 +3752,13 @@ msgstr ""
 
 # type: Content of: <refentry><refnamediv><refname>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:163
 msgid "source"
 msgstr "source"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:247
+#: apt-get.8.xml:164
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -3906,7 +3777,7 @@ msgstr ""
 "literal> 構文で指定します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:255
+#: apt-get.8.xml:172
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> type lines in the &sources-list; file. This means that you "
@@ -3921,7 +3792,7 @@ msgstr ""
 "もっと適切なものを取得します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:179
 #, fuzzy
 #| msgid ""
 #| "If the <option>--compile</option> option is specified then the package "
@@ -3942,7 +3813,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:186
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -3957,7 +3828,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:275
+#: apt-get.8.xml:192
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -3967,13 +3838,13 @@ msgstr ""
 "展開されることに注意してください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:280
+#: apt-get.8.xml:197
 msgid "build-dep"
 msgstr "build-dep"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:281
+#: apt-get.8.xml:198
 #, fuzzy
 #| msgid ""
 #| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
@@ -3989,13 +3860,13 @@ msgstr ""
 "に、パッケージのインストール・削除を行います。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
+#: apt-get.8.xml:204
 msgid "check"
 msgstr "check"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:205
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -4004,12 +3875,12 @@ msgstr ""
 "チェックする診断ツールです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:209
 msgid "download"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:210
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
@@ -4017,7 +3888,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:299
+#: apt-get.8.xml:216
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -4035,13 +3906,13 @@ msgstr ""
 "<literal>apt-get clean</literal> を実行したくなるでしょう。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:225
 msgid "autoclean"
 msgstr "autoclean"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:309
+#: apt-get.8.xml:226
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -4060,13 +3931,13 @@ msgstr ""
 "防げます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:318
+#: apt-get.8.xml:235
 msgid "autoremove"
 msgstr "autoremove"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
+#: apt-get.8.xml:236
 #, fuzzy
 #| msgid ""
 #| "<literal>autoremove</literal> is used to remove packages that were "
@@ -4081,12 +3952,12 @@ msgstr ""
 "され、もう必要なくなったパッケージを削除するのに使用します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323
+#: apt-get.8.xml:240
 msgid "changelog"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:241
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -4099,13 +3970,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:346
+#: apt-get.8.xml:263
 msgid "<option>--no-install-recommends</option>"
 msgstr "<option>--no-install-recommends</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:264
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -4114,7 +3985,7 @@ msgstr ""
 "<literal>APT::Install-Recommends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:351
+#: apt-get.8.xml:268
 #, fuzzy
 #| msgid "<option>--no-suggests</option>"
 msgid "<option>--install-suggests</option>"
@@ -4122,7 +3993,7 @@ msgstr "<option>--no-suggests</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml:269
 #, fuzzy
 #| msgid ""
 #| "Do not consider recommended packages as a dependency for installing.  "
@@ -4135,13 +4006,13 @@ msgstr ""
 "<literal>APT::Install-Recommends</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:356
+#: apt-get.8.xml:273
 msgid "<option>--download-only</option>"
 msgstr "<option>--download-only</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:357
+#: apt-get.8.xml:274
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -4150,13 +4021,13 @@ msgstr ""
 "いません。設定項目 - <literal>APT::Get::Download-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:361
+#: apt-get.8.xml:278
 msgid "<option>--fix-broken</option>"
 msgstr "<option>--fix-broken</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:362
+#: apt-get.8.xml:279
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
@@ -4182,18 +4053,18 @@ msgstr ""
 "<literal>APT::Get::Fix-Broken</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:375
+#: apt-get.8.xml:292
 msgid "<option>--ignore-missing</option>"
 msgstr "<option>--ignore-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:376
+#: apt-get.8.xml:293
 msgid "<option>--fix-missing</option>"
 msgstr "<option>--fix-missing</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:294
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -4212,13 +4083,13 @@ msgstr ""
 "Get::Fix-Missing</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:387
+#: apt-get.8.xml:304
 msgid "<option>--no-download</option>"
 msgstr "<option>--no-download</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:388
+#: apt-get.8.xml:305
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -4230,7 +4101,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:395
+#: apt-get.8.xml:312
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -4249,18 +4120,18 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:405
+#: apt-get.8.xml:322
 msgid "<option>--simulate</option>"
 msgstr "<option>--simulate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:407
+#: apt-get.8.xml:324
 msgid "<option>--dry-run</option>"
 msgstr "<option>--dry-run</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:410
+#: apt-get.8.xml:327
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -4270,7 +4141,7 @@ msgstr ""
 "行いません。設定項目 - <literal>APT::Get::Simulate</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:331
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "
@@ -4288,7 +4159,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:337
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4300,23 +4171,23 @@ msgstr ""
 "空の角カッコは大した問題ではないことを表します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:344
 msgid "<option>-y</option>"
 msgstr "<option>-y</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:344
 msgid "<option>--yes</option>"
 msgstr "<option>--yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:428
+#: apt-get.8.xml:345
 msgid "<option>--assume-yes</option>"
 msgstr "<option>--assume-yes</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:429
+#: apt-get.8.xml:346
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -4330,18 +4201,39 @@ msgstr ""
 "定項目 - <literal>APT::Get::Assume-Yes</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:353
+#, fuzzy
+#| msgid "<option>--assume-yes</option>"
+msgid "<option>--assume-no</option>"
+msgstr "<option>--assume-yes</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:354
+#, fuzzy
+#| msgid ""
+#| "Compile source packages after downloading them.  Configuration Item: "
+#| "<literal>APT::Get::Compile</literal>."
+msgid ""
+"Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
+"Assume-No</literal>."
+msgstr ""
+"ソースパッケージをダウンロード後、コンパイルします。設定項目 - <literal>APT::"
+"Get::Compile</literal>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:358
 msgid "<option>-u</option>"
 msgstr "<option>-u</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:358
 msgid "<option>--show-upgraded</option>"
 msgstr "<option>--show-upgraded</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:437
+#: apt-get.8.xml:359
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4350,18 +4242,18 @@ msgstr ""
 "<literal>APT::Get::Show-Upgraded</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:364
 msgid "<option>-V</option>"
 msgstr "<option>-V</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:364
 msgid "<option>--verbose-versions</option>"
 msgstr "<option>--verbose-versions</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:365
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -4370,14 +4262,14 @@ msgstr ""
 "<literal>APT::Get::Show-Versions</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:370
 #, fuzzy
 #| msgid "<option>--recurse</option>"
 msgid "<option>--host-architecture</option>"
 msgstr "<option>--recurse</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:371
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
@@ -4388,23 +4280,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:379
 msgid "<option>-b</option>"
 msgstr "<option>-b</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:379
 msgid "<option>--compile</option>"
 msgstr "<option>--compile</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:458
+#: apt-get.8.xml:380
 msgid "<option>--build</option>"
 msgstr "<option>--build</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:459
+#: apt-get.8.xml:381
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -4413,13 +4305,13 @@ msgstr ""
 "Get::Compile</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:385
 msgid "<option>--ignore-hold</option>"
 msgstr "<option>--ignore-hold</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:464
+#: apt-get.8.xml:386
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -4432,13 +4324,13 @@ msgstr ""
 "Hold</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:470
+#: apt-get.8.xml:392
 msgid "<option>--no-upgrade</option>"
 msgstr "<option>--no-upgrade</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:393
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4450,12 +4342,12 @@ msgstr ""
 "ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:477
+#: apt-get.8.xml:399
 msgid "<option>--only-upgrade</option>"
 msgstr "<option>--only-upgrade</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:478
+#: apt-get.8.xml:400
 #, fuzzy
 msgid ""
 "Do not install new packages; When used in conjunction with <literal>install</"
@@ -4468,13 +4360,13 @@ msgstr ""
 "ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:484
+#: apt-get.8.xml:406
 msgid "<option>--force-yes</option>"
 msgstr "<option>--force-yes</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:485
+#: apt-get.8.xml:407
 msgid ""
 "Force yes; This is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -4488,13 +4380,13 @@ msgstr ""
 "ねません! 設定項目 - <literal>APT::Get::force-yes</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:492
+#: apt-get.8.xml:414
 msgid "<option>--print-uris</option>"
 msgstr "<option>--print-uris</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:493
+#: apt-get.8.xml:415
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected md5 "
@@ -4515,13 +4407,13 @@ msgstr ""
 "Print-URIs</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:503
+#: apt-get.8.xml:425
 msgid "<option>--purge</option>"
 msgstr "<option>--purge</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:504
+#: apt-get.8.xml:426
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -4534,13 +4426,13 @@ msgstr ""
 "<literal>APT::Get::Purge</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
+#: apt-get.8.xml:433
 msgid "<option>--reinstall</option>"
 msgstr "<option>--reinstall</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:434
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4549,13 +4441,13 @@ msgstr ""
 "定項目 - <literal>APT::Get::ReInstall</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:516
+#: apt-get.8.xml:438
 msgid "<option>--list-cleanup</option>"
 msgstr "<option>--list-cleanup</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:517
+#: apt-get.8.xml:439
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -4571,18 +4463,18 @@ msgstr ""
 "する時ぐらいでしょう。設定項目 - <literal>APT::Get::List-Cleanup</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:448
 msgid "<option>--target-release</option>"
 msgstr "<option>--target-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:527
+#: apt-get.8.xml:449
 msgid "<option>--default-release</option>"
 msgstr "<option>--default-release</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:450
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -4604,13 +4496,13 @@ msgstr ""
 "Release</literal>。&apt-preferences; のマニュアルページもご覧ください。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:541
+#: apt-get.8.xml:463
 msgid "<option>--trivial-only</option>"
 msgstr "<option>--trivial-only</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:465
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4623,13 +4515,13 @@ msgstr ""
 "目 - <literal>APT::Get::Trivial-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
+#: apt-get.8.xml:471
 msgid "<option>--no-remove</option>"
 msgstr "<option>--no-remove</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:550
+#: apt-get.8.xml:472
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4638,13 +4530,13 @@ msgstr ""
 "項目 - <literal>APT::Get::Remove</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:477
 msgid "<option>--auto-remove</option>"
 msgstr "<option>--auto-remove</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:556
+#: apt-get.8.xml:478
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4657,13 +4549,13 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:562
+#: apt-get.8.xml:484
 msgid "<option>--only-source</option>"
 msgstr "<option>--only-source</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:563
+#: apt-get.8.xml:485
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -4681,23 +4573,23 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--diff-only</option>"
 msgstr "<option>--diff-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--dsc-only</option>"
 msgstr "<option>--dsc-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--tar-only</option>"
 msgstr "<option>--tar-only</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:574
+#: apt-get.8.xml:496
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4708,13 +4600,13 @@ msgstr ""
 "Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:579
+#: apt-get.8.xml:501
 msgid "<option>--arch-only</option>"
 msgstr "<option>--arch-only</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:580
+#: apt-get.8.xml:502
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -4723,13 +4615,13 @@ msgstr ""
 "<literal>APT::Get::Arch-Only</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:584
+#: apt-get.8.xml:506
 msgid "<option>--allow-unauthenticated</option>"
 msgstr "<option>--allow-unauthenticated</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:585
+#: apt-get.8.xml:507
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -4740,7 +4632,7 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:598
+#: apt-get.8.xml:520
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
@@ -4750,7 +4642,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:607
+#: apt-get.8.xml:529
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -4762,7 +4654,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:613
+#: apt-get.8.xml:535
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -4771,22 +4663,22 @@ msgstr ""
 "100 を返します。"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:616
+#: apt-get.8.xml:538
 msgid "ORIGINAL AUTHORS"
 msgstr "原著者"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:617
+#: apt-get.8.xml:539
 msgid "&apt-author.jgunthorpe;"
 msgstr "&apt-author.jgunthorpe;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:620
+#: apt-get.8.xml:542
 msgid "CURRENT AUTHORS"
 msgstr "現著者"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:622
+#: apt-get.8.xml:544
 msgid "&apt-author.team;"
 msgstr "&apt-author.team;"
 
@@ -4802,23 +4694,9 @@ msgstr "apt-key"
 msgid "APT key management utility"
 msgstr "APT キー管理ユーティリティ"
 
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-key.8.xml:31
-msgid ""
-"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
-"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
-"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
-"arg>"
-msgstr ""
-"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
-"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
-"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
-"arg>"
-
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:40
+#: apt-key.8.xml:32
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -4830,94 +4708,98 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:46
+#: apt-key.8.xml:38
 msgid "Commands"
 msgstr "コマンド"
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:48
-msgid "add <replaceable>filename</replaceable>"
-msgstr "add <replaceable>filename</replaceable>"
+#: apt-key.8.xml:40
+msgid "add &synopsis-param-filename;"
+msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:44
+#, fuzzy
+#| msgid ""
+#| "Add a new key to the list of trusted keys.  The key is read from "
+#| "<replaceable>filename</replaceable>, or standard input if "
+#| "<replaceable>filename</replaceable> is <literal>-</literal>."
 msgid ""
-"Add a new key to the list of trusted keys.  The key is read from "
-"<replaceable>filename</replaceable>, or standard input if "
-"<replaceable>filename</replaceable> is <literal>-</literal>."
+"Add a new key to the list of trusted keys.  The key is read from &synopsis-"
+"param-filename;, or standard input if &synopsis-param-filename; is <literal>-"
+"</literal>."
 msgstr ""
 "信頼キー一覧に新しいキーを追加します。このキーは <replaceable>filename</"
 "replaceable> から読み込みますが、<replaceable>filename</replaceable> を "
 "<literal>-</literal> とすると、標準入力から読み込みます。"
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:60
-msgid "del <replaceable>keyid</replaceable>"
-msgstr "del <replaceable>keyid</replaceable>"
+#: apt-key.8.xml:52
+msgid "del &synopsis-param-keyid;"
+msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:64
+#: apt-key.8.xml:56
 msgid "Remove a key from the list of trusted keys."
 msgstr "信頼キー一覧からキーを削除します。"
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:71
-msgid "export <replaceable>keyid</replaceable>"
-msgstr "export <replaceable>keyid</replaceable>"
+#: apt-key.8.xml:63
+msgid "export &synopsis-param-keyid;"
+msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:75
-msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+#: apt-key.8.xml:67
+#, fuzzy
+#| msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "キー <replaceable>keyid</replaceable> を標準出力に出力します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:74
 msgid "exportall"
 msgstr "exportall"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:86
+#: apt-key.8.xml:78
 msgid "Output all trusted keys to standard output."
 msgstr "信頼するキーをすべて標準出力に出力します。"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:85
 msgid "list"
 msgstr "list"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:97
+#: apt-key.8.xml:89
 msgid "List trusted keys."
 msgstr "信頼キーを一覧表示します。"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:96
 msgid "finger"
 msgstr "finger"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:108
+#: apt-key.8.xml:100
 msgid "List fingerprints of trusted keys."
 msgstr "信頼キーのフィンガープリントを一覧表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:107
 msgid "adv"
 msgstr "adv"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:119
+#: apt-key.8.xml:111
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -4926,7 +4808,7 @@ msgstr ""
 "できます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:131
+#: apt-key.8.xml:123
 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 "
@@ -4936,14 +4818,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:141
+#: apt-key.8.xml:133
 #, fuzzy
 #| msgid "update"
 msgid "net-update"
 msgstr "update"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:137
 msgid ""
 "Work similar to the <command>update</command> command above, but get the "
 "archive keyring from an URI instead and validate it against a master key.  "
@@ -4954,7 +4836,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:154
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -4962,14 +4844,21 @@ msgstr ""
 "前節で説明したコマンドの前に、このオプションを定義する必要があることに注意し"
 "てください。"
 
-# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:164
-msgid "--keyring <replaceable>filename</replaceable>"
-msgstr "--keyring <replaceable>filename</replaceable>"
+#: apt-key.8.xml:156
+msgid "--keyring &synopsis-param-filename;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:165
+#: apt-key.8.xml:157
+#, fuzzy
+#| msgid ""
+#| "With this option it is possible to specify a specific keyring file the "
+#| "command should operate on. The default is that a command is executed on "
+#| "the <filename>trusted.gpg</filename> file as well as on all parts in the "
+#| "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
+#| "gpg</filename> is the primary keyring which means that e.g. new keys are "
+#| "added to this one."
 msgid ""
 "With this option it is possible to specify a specific keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -4985,35 +4874,35 @@ msgstr ""
 "加されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:178
+#: apt-key.8.xml:170
 msgid "&file-trustedgpg;"
 msgstr "&file-trustedgpg;"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:180
+#: apt-key.8.xml:172
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:173
 msgid "Local trust database of archive keys."
 msgstr "アーカイブキーのローカル信頼データベースです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:184
+#: apt-key.8.xml:176
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:177
 msgid "Keyring of Debian archive trusted keys."
 msgstr "Debian アーカイブ信頼キーのキーリングです。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:188
+#: apt-key.8.xml:180
 msgid ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
@@ -5021,13 +4910,13 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:181
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr "削除された Debian アーカイブ信頼キーのキーリングです。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:198
+#: apt-key.8.xml:190
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
@@ -5057,36 +4946,9 @@ msgstr "apt-mark"
 msgid "mark/unmark a package as being automatically-installed"
 msgstr "パッケージが自動的にインストールされたかどうかのマークを変更します。"
 
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-mark.8.xml:39
-#, fuzzy
-#| msgid ""
-#| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
-#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
-#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
-msgid ""
-"  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
-"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
-"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> </group>"
-msgstr ""
-"  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
-"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
-
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:39
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -5096,7 +4958,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:61
+#: apt-mark.8.xml:43
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -5111,7 +4973,7 @@ msgstr ""
 "command> や <command>aptitude</command> により削除されます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:51
 #, fuzzy
 #| msgid "markauto"
 msgid "auto"
@@ -5119,7 +4981,7 @@ msgstr "markauto"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:52
 #, fuzzy
 #| msgid ""
 #| "<literal>markauto</literal> is used to mark a package as being "
@@ -5135,13 +4997,13 @@ msgstr ""
 "なくなると、このパッケージを削除します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:59
 msgid "manual"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:78
+#: apt-mark.8.xml:60
 #, fuzzy
 #| msgid ""
 #| "<literal>unmarkauto</literal> is used to mark a package as being manually "
@@ -5157,12 +5019,12 @@ msgstr ""
 "ケージを自動的に削除するのを防ぎます。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:67
 msgid "hold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:68
 msgid ""
 "<literal>hold</literal> is used to mark a package as hold back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -5172,13 +5034,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:95
+#: apt-mark.8.xml:77
 msgid "unhold"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:78
 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "
@@ -5191,13 +5053,13 @@ msgstr ""
 "ケージごとに改行して表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:83
 msgid "showauto"
 msgstr "showauto"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:102
+#: apt-mark.8.xml:84
 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "
@@ -5212,14 +5074,14 @@ msgstr ""
 "ケージごとに改行して表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:109
+#: apt-mark.8.xml:91
 #, fuzzy
 #| msgid "showauto"
 msgid "showmanual"
 msgstr "showauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:110
+#: apt-mark.8.xml:92
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -5227,7 +5089,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:116
+#: apt-mark.8.xml:98
 #, fuzzy
 #| msgid "showauto"
 msgid "showhold"
@@ -5235,7 +5097,7 @@ msgstr "showauto"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:99
 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "
@@ -5248,14 +5110,14 @@ msgstr ""
 "ケージごとに改行して表示します。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:130
+#: apt-mark.8.xml:112
 msgid ""
 "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
 "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:131
+#: apt-mark.8.xml:113
 msgid ""
 "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
 "option>"
@@ -5265,7 +5127,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:116
 msgid ""
 "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
 "filename> instead of the default location, which is "
@@ -5277,19 +5139,19 @@ msgstr ""
 "filename> からパッケージの統計を読み書きします。"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:146
+#: apt-mark.8.xml:128
 msgid "  &file-extended_states;"
 msgstr "  &file-extended_states;"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:151
+#: apt-mark.8.xml:133
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr "&apt-get;,&aptitude;,&apt-conf;"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:155
+#: apt-mark.8.xml:137
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -5656,23 +5518,9 @@ msgstr "apt-sortpkgs"
 msgid "Utility to sort package index files"
 msgstr "パッケージインデックスファイルのソートユーティリティ"
 
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-sortpkgs.1.xml:39
-msgid ""
-"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-msgstr ""
-"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:48
+#: apt-sortpkgs.1.xml:39
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (Source index or "
 "Package index) and sort the records so that they are ordered by the package "
@@ -5685,19 +5533,19 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:54
+#: apt-sortpkgs.1.xml:45
 msgid "All output is sent to stdout, the input must be a seekable file."
 msgstr ""
 "出力はすべて標準出力に送られ、入力は検索できるファイルでなければなりません。"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:61
+#: apt-sortpkgs.1.xml:52
 msgid "<option>--source</option>"
 msgstr "<option>--source</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:63
+#: apt-sortpkgs.1.xml:54
 msgid ""
 "Use Source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -5707,7 +5555,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:77
+#: apt-sortpkgs.1.xml:68
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -6350,6 +6198,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:294
+#, fuzzy
+#| msgid ""
+#| "Two sub-options to limit the use of PDiffs are also available: With "
+#| "<literal>FileLimit</literal> can be specified how many PDiff files are "
+#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+#| "other hand is the maximum percentage of the size of all patches compared "
+#| "to the size of the targeted file. If one of these limits is exceeded the "
+#| "complete file is downloaded instead of the patches."
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: With "
 "<literal>FileLimit</literal> can be specified how many PDiff files are "
@@ -6418,7 +6274,7 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:321 sources.list.5.xml:155
+#: apt.conf.5.xml:321 sources.list.5.xml:160
 msgid "http"
 msgstr "http"
 
@@ -6581,7 +6437,7 @@ msgstr ""
 
 # type: <tag></tag>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:387 sources.list.5.xml:166
+#: apt.conf.5.xml:387 sources.list.5.xml:171
 msgid "ftp"
 msgstr "ftp"
 
@@ -6667,7 +6523,7 @@ msgstr ""
 
 # type: Content of: <refentry><refnamediv><refname>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426 sources.list.5.xml:148
+#: apt.conf.5.xml:426 sources.list.5.xml:153
 msgid "cdrom"
 msgstr "cdrom"
 
@@ -9531,9 +9387,20 @@ msgid ""
 "will be downloaded."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:121
+msgid ""
+"<literal>trusted=yes</literal> can be set to indicate that packages from "
+"this source are always authenificated even if the <filename>Release</"
+"filename> file is not signed or the signature can't be checked. This "
+"disables parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context. <literal>trusted=no</literal> is the opposite which "
+"handles even correctly authenificated sources as not authenificated."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:123
+#: sources.list.5.xml:128
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -9547,12 +9414,12 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:128
+#: sources.list.5.xml:133
 msgid "Some examples:"
 msgstr "例:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:135
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -9565,19 +9432,19 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:141
 msgid "URI specification"
 msgstr "URI の仕様"
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:146
 msgid "file"
 msgstr "ファイル"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:143
+#: sources.list.5.xml:148
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -9588,7 +9455,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:150
+#: sources.list.5.xml:155
 msgid ""
 "The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -9599,7 +9466,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:157
+#: sources.list.5.xml:162
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -9616,7 +9483,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:173
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
@@ -9635,13 +9502,13 @@ msgstr ""
 "れます。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:177
+#: sources.list.5.xml:182
 msgid "copy"
 msgstr "copy"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:179
+#: sources.list.5.xml:184
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -9652,18 +9519,18 @@ msgstr ""
 "て、APT でコピーを行う場合に便利です。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
 msgid "rsh"
 msgstr "rsh"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
 msgid "ssh"
 msgstr "ssh"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:186
+#: sources.list.5.xml:191
 msgid ""
 "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
 "user and access the files. It is a good idea to do prior arrangements with "
@@ -9678,12 +9545,12 @@ msgstr ""
 "します。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:199
 msgid "more recognizable URI types"
 msgstr "さらに認識できる URI タイプ"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:196
+#: sources.list.5.xml:201
 msgid ""
 "APT can be extended with more methods shipped in other optional packages "
 "which should follow the nameing scheme <literal>apt-transport-"
@@ -9697,7 +9564,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:138
+#: sources.list.5.xml:143
 msgid ""
 "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
 "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -9707,7 +9574,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:215
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -9716,37 +9583,37 @@ msgstr ""
 "free 用のローカル (または NFS) アーカイブを使用します。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:217
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:214
+#: sources.list.5.xml:219
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr "上記同様ですが、不安定版 (開発版) を使用します。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:220
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:222
 msgid "Source line for the above"
 msgstr "上記のソース行"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:223
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:225
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -9754,7 +9621,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:227
 #, fuzzy, no-wrap
 #| msgid ""
 #| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -9770,7 +9637,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:230
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -9780,14 +9647,14 @@ msgstr ""
 
 # type: <example></example>
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
+#: sources.list.5.xml:232
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:229
+#: sources.list.5.xml:234
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -9797,14 +9664,14 @@ msgstr ""
 
 # type: <example></example>
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:231
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:238
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -9818,13 +9685,13 @@ msgstr ""
 
 # type: <example></example>
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:246
+#: sources.list.5.xml:251
 #, fuzzy, no-wrap
 #| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
@@ -9832,7 +9699,7 @@ msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:244
 #, fuzzy
 #| msgid ""
 #| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
@@ -9861,7 +9728,7 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:256
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
@@ -11049,6 +10916,266 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "これで、disc にある取得済みのアーカイブを使用するようになります。"
 
+# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
+#, fuzzy
+#~| msgid ""
+#~| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
+#~| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
+#~| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> "
+#~| "<arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg "
+#~| "choice=\"plain\"><replaceable>regex</replaceable></arg></arg> <arg>show "
+#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
+#~| "arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
+#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~| "<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></"
+#~| "arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>xvcg <arg choice="
+#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~| "<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</"
+#~| "replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkgs</replaceable></arg></arg> </group>"
+#~ msgid ""
+#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
+#~ "arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> "
+#~ "<arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</"
+#~ "replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>depends <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~ "<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~ "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
+#~ "\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~ "<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
+#~ "group>"
+#~ msgstr ""
+#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
+#~ "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~ "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
+#~ "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
+#~ "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~ "<arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~ "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice="
+#~ "\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
+#~ "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
+#~ "group>"
+
+# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
+#~ msgid ""
+#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
+#~ "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></"
+#~ "arg> <arg><option>-o=<replaceable>config string</replaceable></option></"
+#~ "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> "
+#~ "<group> <arg>add</arg> <arg>ident</arg> </group>"
+#~ msgstr ""
+#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
+#~ "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></"
+#~ "arg> <arg><option>-o=<replaceable>config string</replaceable></option></"
+#~ "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> "
+#~ "<group> <arg>add</arg> <arg>ident</arg> </group>"
+
+# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
+#~ msgid ""
+#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
+#~ msgstr ""
+#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
+
+# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
+#~ msgid ""
+#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
+#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
+#~ "replaceable></arg>"
+#~ msgstr ""
+#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
+#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
+#~ "replaceable></arg>"
+
+# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
+#~ msgid ""
+#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
+#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
+#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+#~ "arg> <arg><option>--arch <replaceable>architecture</replaceable></"
+#~ "option></arg> <arg><option>-o <replaceable>config</"
+#~ "replaceable>=<replaceable>string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
+#~ "replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#~ "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
+#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
+#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
+#~ "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
+#~ "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
+#~ "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
+#~ "group>"
+#~ msgstr ""
+#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
+#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
+#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+#~ "arg> <arg><option>--arch <replaceable>architecture</replaceable></"
+#~ "option></arg> <arg><option>-o <replaceable>config</"
+#~ "replaceable>=<replaceable>string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
+#~ "replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#~ "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
+#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
+#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
+#~ "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
+#~ "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
+#~ "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
+#~ "group>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#~| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
+#~| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </"
+#~| "arg> <arg> <option>-t=</option> <arg choice='plain'> "
+#~| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
+#~| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
+#~| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
+#~| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
+#~| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
+#~| "<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </"
+#~| "arg> <arg choice='plain'> /<replaceable>target_release</replaceable> </"
+#~| "arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
+#~| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
+#~| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
+#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> "
+#~| "<arg> <group choice='req'> <arg choice='plain'> "
+#~| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+#~| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#~| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#~| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#~| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#~| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#~| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#~| "help</arg> </group> </arg> </group>"
+#~ msgid ""
+#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#~ "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
+#~ "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
+#~ "<arg> <option>-t=</option> <arg choice='plain'> "
+#~ "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
+#~ "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
+#~ "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
+#~ "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
+#~ "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
+#~ "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
+#~ "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#~ "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
+#~ "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
+#~ "<group choice='req'> <arg choice='plain'> "
+#~ "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+#~ "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~ "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#~ "help</arg> </group> </arg> </group>"
+#~ msgstr ""
+#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#~ "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
+#~ "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
+#~ "<arg> <option>-t=</option> <arg choice='plain'> "
+#~ "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
+#~ "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
+#~ "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
+#~ "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
+#~ "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
+#~ "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
+#~ "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#~ "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
+#~ "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
+#~ "<group choice='req'> <arg choice='plain'> "
+#~ "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+#~ "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~ "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#~ "help</arg> </group> </arg> </group>"
+
+# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
+#~ msgid ""
+#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+#~ "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
+#~ "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
+#~ "option></arg>"
+#~ msgstr ""
+#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+#~ "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
+#~ "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
+#~ "option></arg>"
+
+# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
+#~ msgid "add <replaceable>filename</replaceable>"
+#~ msgstr "add <replaceable>filename</replaceable>"
+
+# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
+#~ msgid "del <replaceable>keyid</replaceable>"
+#~ msgstr "del <replaceable>keyid</replaceable>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid "export <replaceable>keyid</replaceable>"
+#~ msgstr "export <replaceable>keyid</replaceable>"
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #~ msgid ""
 #~ "Update the local keyring with the keyring of Debian archive keys and "
@@ -11057,6 +11184,47 @@ msgstr "これで、disc にある取得済みのアーカイブを使用する�
 #~ "Debian アーカイブキーで、ローカルキーリングを更新し、もう有効でないキーを"
 #~ "キーリングから削除します。"
 
+# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
+#~ msgid "--keyring <replaceable>filename</replaceable>"
+#~ msgstr "--keyring <replaceable>filename</replaceable>"
+
+# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
+#, fuzzy
+#~| msgid ""
+#~| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#~| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> "
+#~| "<group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> "
+#~| "<arg choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</"
+#~| "arg> </group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#~| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
+#~ msgid ""
+#~ "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
+#~ "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
+#~ "choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
+#~ "choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </"
+#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#~ "replaceable></arg> </arg> </group>"
+#~ msgstr ""
+#~ "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
+#~ "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
+#~ "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
+#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#~ "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
+
+# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
+#~ msgid ""
+#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
+#~ msgstr ""
+#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
+
 #~ msgid "<option>--md5</option>"
 #~ msgstr "<option>--md5</option>"
 
diff --git a/doc/po/pl.po b/doc/po/pl.po
index af47d1e2d..c098c74a8 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
-"POT-Creation-Date: 2011-11-20 17:58+0100\n"
+"POT-Creation-Date: 2012-04-11 17:54+0300\n"
 "PO-Revision-Date: 2010-03-18 22:00+0100\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: <debian-l10n-polish@lists.debian.org>\n"
@@ -658,7 +658,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:210
+#: apt.ent:211
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -678,6 +678,101 @@ msgstr ""
 "     oryginał zostanie zaktualizowany, a tłumaczenie - nie.\n"
 "\">\n"
 
+#. type: Plain text
+#: apt.ent:214
+msgid ""
+"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
+"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:217
+msgid ""
+"<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+"synopsis-config-file \"config_file\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:220
+msgid ""
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
+"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"\"target_release\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:223
+msgid ""
+"<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+"synopsis-architecture \"architecture\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:226
+msgid ""
+"<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+"--> <!ENTITY synopsis-pkg \"pkg\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:229
+msgid ""
+"<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
+"ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:232
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+"pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:235
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+"awesome --> <!ENTITY synopsis-regex \"regex\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:238
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
+"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:241
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
+"apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+"\"temporary_directory\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:244
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+"synopsis-filename \"filename\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:250
+msgid ""
+"<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive "
+"packages path override pathprefix --> <!ENTITY synopsis-path \"path\"> <!"
+"ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section "
+"\"section\"> <!ENTITY synopsis-override \"override\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:253
+msgid ""
+"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+msgstr ""
+
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:16
@@ -717,86 +812,18 @@ msgstr "APT"
 msgid "query the APT cache"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cache.8.xml:39
-#, fuzzy
-#| msgid ""
-#| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
-#| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
-#| "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
-#| "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice="
-#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#| "<arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice="
-#| "\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#| "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
-#| "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
-#| "group>"
-msgid ""
-"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
-"<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
-"arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></arg></"
-"arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>policy <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></"
-"arg> </group>"
-msgstr ""
-"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
-"o=<replaceable>opcja_konfiguracji</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>plik</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>add <arg choice=\"plain\" rep=\"repeat\"><replaceable>plik</"
-"replaceable></arg></arg> <arg>gencaches</arg> <arg>showpkg <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></arg></arg> "
-"<arg>showsrc <arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</"
-"replaceable></arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</"
-"arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
-"\"><replaceable>wyrażenie-regularne</replaceable></arg></arg> <arg>show <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></arg></"
-"arg> <arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</"
-"replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pakiet</replaceable></arg></arg> <arg>pkgnames <arg choice="
-"\"plain\"><replaceable>prefiks</replaceable></arg></arg> <arg>dotty <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></arg></"
-"arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</"
-"replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pakiety</replaceable></arg></arg> <arg>madison <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pakiety</replaceable></arg></arg> </"
-"group>"
-
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
-#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121
-#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
-#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
+#: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38
+#: apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38
+#: apt-key.8.xml:30 apt-mark.8.xml:38 apt-secure.8.xml:43
+#: apt-sortpkgs.1.xml:38 apt.conf.5.xml:42 apt_preferences.5.xml:36
 #: sources.list.5.xml:36
 msgid "Description"
 msgstr "Opis"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:65
+#: apt-cache.8.xml:39
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -810,7 +837,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:70 apt-get.8.xml:127
+#: apt-cache.8.xml:44 apt-get.8.xml:44
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -819,13 +846,13 @@ msgstr ""
 "<option>-h</option> albo <option>--help</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:74
+#: apt-cache.8.xml:48
 msgid "gencaches"
 msgstr "gencaches"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:75
+#: apt-cache.8.xml:49
 msgid ""
 "<literal>gencaches</literal> performs the same operation as <command>apt-get "
 "check</command>. It builds the source and package caches from the sources in "
@@ -837,13 +864,13 @@ msgstr ""
 "status</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:81
+#: apt-cache.8.xml:55
 msgid "showpkg <replaceable>pkg(s)</replaceable>"
 msgstr "showpkg <replaceable>pakiet(y)</replaceable>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:82
+#: apt-cache.8.xml:56
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -866,7 +893,7 @@ msgstr ""
 "poniższego:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:94
+#: apt-cache.8.xml:68
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -893,7 +920,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:106
+#: apt-cache.8.xml:80
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -912,13 +939,13 @@ msgstr ""
 "przejrzeć kod źródłowy programu apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:89
 msgid "stats"
 msgstr "stats"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:89
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -928,7 +955,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:118
+#: apt-cache.8.xml:92
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -938,7 +965,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:122
+#: apt-cache.8.xml:96
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -952,7 +979,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:128
+#: apt-cache.8.xml:102
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -970,7 +997,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:136
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -985,7 +1012,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:142
+#: apt-cache.8.xml:116
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -1000,7 +1027,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:149
+#: apt-cache.8.xml:123
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -1017,7 +1044,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:130
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache; this value is therefore at least equal to the number of "
@@ -1034,7 +1061,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:163
+#: apt-cache.8.xml:137
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -1043,13 +1070,13 @@ msgstr ""
 "więzów zależności wymaganych przez wszystkie pakiety w buforze."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:170
+#: apt-cache.8.xml:144
 msgid "showsrc <replaceable>pkg(s)</replaceable>"
 msgstr "showsrc <replaceable>pakiet(y)</replaceable>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -1060,13 +1087,13 @@ msgstr ""
 "tych pakietów oraz pakiety binarne, które są z tych pakietów budowane."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:176 apt-config.8.xml:87
+#: apt-cache.8.xml:150 apt-config.8.xml:75
 msgid "dump"
 msgstr "dump"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:151
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -1075,13 +1102,13 @@ msgstr ""
 "Jest używany głównie w celu odpluskwiania."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:181
+#: apt-cache.8.xml:155
 msgid "dumpavail"
 msgstr "dumpavail"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:156
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
@@ -1091,13 +1118,13 @@ msgstr ""
 "&dpkg;  i jest używane w metodzie &dselect; tego programu."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:186
+#: apt-cache.8.xml:160
 msgid "unmet"
 msgstr "unmet"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:161
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -1106,13 +1133,13 @@ msgstr ""
 "zależności w buforze pakietów"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml:165
 msgid "show <replaceable>pkg(s)</replaceable>"
 msgstr "show <replaceable>pakiet(y)</replaceable>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -1121,7 +1148,7 @@ msgstr ""
 "avail</command>; pokazuje szczegółowe informacje o podanych pakietach."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:171
 msgid "search <replaceable>regex [ regex ... ]</replaceable>"
 msgstr ""
 "search <replaceable>wyrażenie regularne [ wyrażenie regularne ... ]</"
@@ -1129,7 +1156,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:172
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see "
@@ -1156,7 +1183,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:211
+#: apt-cache.8.xml:185
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -1165,13 +1192,13 @@ msgstr ""
 "traktowane jakby były połączone spójnikiem logicznym \"i\"."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:215
+#: apt-cache.8.xml:189
 msgid "depends <replaceable>pkg(s)</replaceable>"
 msgstr "depends <replaceable>pakiet(y)</replaceable>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:216
+#: apt-cache.8.xml:190
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -1180,13 +1207,13 @@ msgstr ""
 "pakietu i wszystkie możliwe pakiety, które mogą spełnić te zależności."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:220
+#: apt-cache.8.xml:194
 msgid "rdepends <replaceable>pkg(s)</replaceable>"
 msgstr "rdepends <replaceable>pakiet(y)</replaceable>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:195
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -1195,13 +1222,13 @@ msgstr ""
 "danego pakietu."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:225
+#: apt-cache.8.xml:199
 msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
 msgstr "pkgnames <replaceable>[ prefiks ]</replaceable>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml:200
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -1216,7 +1243,7 @@ msgstr ""
 "używać z opcją <option>--generate</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:205
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -1228,13 +1255,13 @@ msgstr ""
 "liście."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:236
+#: apt-cache.8.xml:210
 msgid "dotty <replaceable>pkg(s)</replaceable>"
 msgstr "dotty <replaceable>pakiet(y)</replaceable>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:237
+#: apt-cache.8.xml:211
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1256,7 +1283,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:246
+#: apt-cache.8.xml:220
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -1271,17 +1298,17 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:251
+#: apt-cache.8.xml:225
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr "Uwaga: dotty nie potrafi narysować większego zbioru pakietów."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
+#: apt-cache.8.xml:228
 msgid "xvcg <replaceable>pkg(s)</replaceable>"
 msgstr "xvcg <replaceable>pakiet(y)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:229
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -1291,13 +1318,13 @@ msgstr ""
 "ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:259
+#: apt-cache.8.xml:233
 msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
 msgstr "policy <replaceable>[ pakiet(y) ]</replaceable>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:260
+#: apt-cache.8.xml:234
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -1310,13 +1337,13 @@ msgstr ""
 "wypisuje szczegółowe informacje o priorytecie danego pakietu."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:266
+#: apt-cache.8.xml:240
 msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
 msgstr "madison <replaceable>[ pakiet(y) ]</replaceable>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:267
+#: apt-cache.8.xml:241
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -1334,25 +1361,25 @@ msgstr ""
 "pakietów (<literal>APT::Architecture</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126
-#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
+#: apt-cache.8.xml:252 apt-config.8.xml:84 apt-extracttemplates.1.xml:51
+#: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
+#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:577 apt.conf.5.xml:599
 msgid "options"
 msgstr "opcje"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:256
 msgid "<option>-p</option>"
 msgstr "<option>-p</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:256
 msgid "<option>--pkg-cache</option>"
 msgstr "<option>--pkg-cache</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:283
+#: apt-cache.8.xml:257
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -1363,19 +1390,19 @@ msgstr ""
 "<literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404
-#: apt-sortpkgs.1.xml:61
+#: apt-cache.8.xml:262 apt-ftparchive.1.xml:551 apt-get.8.xml:321
+#: apt-sortpkgs.1.xml:52
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
+#: apt-cache.8.xml:262
 msgid "<option>--src-cache</option>"
 msgstr "<option>--src-cache</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:263
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1391,18 +1418,18 @@ msgstr ""
 "Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
+#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
+#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:271
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1416,18 +1443,18 @@ msgstr ""
 "pliku konfiguracyjnym: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:277
 msgid "<option>-i</option>"
 msgstr "<option>-i</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:277
 msgid "<option>--important</option>"
 msgstr "<option>--important</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:304
+#: apt-cache.8.xml:278
 msgid ""
 "Print only important dependencies; for use with unmet and depends. Causes "
 "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
@@ -1438,56 +1465,56 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
+#: apt-cache.8.xml:283
 #, fuzzy
 #| msgid "<option>--no-upgrade</option>"
 msgid "<option>--no-pre-depends</option>"
 msgstr "<option>--no-upgrade</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:284
 #, fuzzy
 #| msgid "<option>--no-download</option>"
 msgid "<option>--no-depends</option>"
 msgstr "<option>--no-download</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:285
 #, fuzzy
 #| msgid "<option>--install-recommends</option>"
 msgid "<option>--no-recommends</option>"
 msgstr "<option>--install-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:286
 #, fuzzy
 #| msgid "<option>--no-upgrade</option>"
 msgid "<option>--no-suggests</option>"
 msgstr "<option>--no-upgrade</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:287
 #, fuzzy
 #| msgid "<option>--no-mount</option>"
 msgid "<option>--no-conflicts</option>"
 msgstr "<option>--no-mount</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:314
+#: apt-cache.8.xml:288
 #, fuzzy
 #| msgid "<option>--no-act</option>"
 msgid "<option>--no-breaks</option>"
 msgstr "<option>--no-act</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315
+#: apt-cache.8.xml:289
 #, fuzzy
 #| msgid "<option>--no-act</option>"
 msgid "<option>--no-replaces</option>"
 msgstr "<option>--no-act</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:290
 #, fuzzy
 #| msgid "<option>--no-act</option>"
 msgid "<option>--no-enhances</option>"
@@ -1495,7 +1522,7 @@ msgstr "<option>--no-act</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:291
 #, fuzzy
 #| msgid ""
 #| "Make <literal>depends</literal> and <literal>rdepends</literal> recursive "
@@ -1514,18 +1541,18 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
+#: apt-cache.8.xml:297 apt-cdrom.8.xml:111 apt-get.8.xml:278
 msgid "<option>-f</option>"
 msgstr "<option>-f</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323
+#: apt-cache.8.xml:297
 msgid "<option>--full</option>"
 msgstr "<option>--full</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:324
+#: apt-cache.8.xml:298
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -1534,19 +1561,19 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
-#: apt-get.8.xml:447
+#: apt-cache.8.xml:302 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563
+#: apt-get.8.xml:369
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:302
 msgid "<option>--all-versions</option>"
 msgstr "<option>--all-versions</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:303
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -1564,18 +1591,18 @@ msgstr ""
 "AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:311
 msgid "<option>-g</option>"
 msgstr "<option>-g</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:311
 msgid "<option>--generate</option>"
 msgstr "<option>--generate</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:312
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1587,18 +1614,18 @@ msgstr ""
 "<literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:317
 msgid "<option>--names-only</option>"
 msgstr "<option>--names-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343 apt-cdrom.8.xml:142
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:129
 msgid "<option>-n</option>"
 msgstr "<option>-n</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:318
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1607,13 +1634,13 @@ msgstr ""
 "pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:348
+#: apt-cache.8.xml:322
 msgid "<option>--all-names</option>"
 msgstr "<option>--all-names</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:323
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -1625,13 +1652,13 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:354
+#: apt-cache.8.xml:328
 msgid "<option>--recurse</option>"
 msgstr "<option>--recurse</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:355
+#: apt-cache.8.xml:329
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1643,13 +1670,13 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:360
+#: apt-cache.8.xml:334
 msgid "<option>--installed</option>"
 msgstr "<option>--installed</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:362
+#: apt-cache.8.xml:336
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -1660,48 +1687,48 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:591
-#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89
+#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513
+#: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:596 apt-key.8.xml:175 apt-mark.8.xml:144
+#: apt-cache.8.xml:346 apt-get.8.xml:518 apt-key.8.xml:167 apt-mark.8.xml:126
 #: apt.conf.5.xml:1110 apt_preferences.5.xml:697
 msgid "Files"
 msgstr "Pliki"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:348
 msgid "&file-sourceslist; &file-statelists;"
 msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:606
-#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704
-#: sources.list.5.xml:250
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94
+#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528
+#: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704
+#: sources.list.5.xml:255
 msgid "See Also"
 msgstr "Zobacz także"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:380
+#: apt-cache.8.xml:354
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:612
-#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99
+#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534
+#: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr "Diagnostyka"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:385
+#: apt-cache.8.xml:359
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1729,24 +1756,9 @@ msgstr "apt-cdrom"
 msgid "APT CDROM management utility"
 msgstr "Narzędzie APT do zarządzania źródłami typu CDROM"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cdrom.8.xml:38
-msgid ""
-"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
-"<arg>add</arg> <arg>ident</arg> </group>"
-msgstr ""
-"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>punkt montowania CD-ROM-u</replaceable></"
-"option></arg> <arg><option>-o=<replaceable>opcja konfiguracji</replaceable></"
-"option></arg> <arg><option>-c=<replaceable>plik</replaceable></option></arg> "
-"<group> <arg>add</arg> <arg>identyfikator</arg> </group>"
-
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
+#: apt-cdrom.8.xml:38
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -1760,7 +1772,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:45
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
@@ -1771,13 +1783,13 @@ msgstr ""
 "w wielodyskowym archiwum musi być włożony i zeskanowany oddzielnie."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:68
+#: apt-cdrom.8.xml:55
 msgid "add"
 msgstr "add"
 
 #
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:69
+#: apt-cdrom.8.xml:56
 #, fuzzy
 #| msgid ""
 #| "<literal>add</literal> is used to add a new disc to the source list. It "
@@ -1800,7 +1812,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:77
+#: apt-cdrom.8.xml:64
 msgid ""
 "APT uses a CDROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -1811,13 +1823,13 @@ msgstr ""
 "<filename>&statedir;/cdroms.list</filename>"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:84
+#: apt-cdrom.8.xml:71
 msgid "ident"
 msgstr "ident"
 
 #
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:85
+#: apt-cdrom.8.xml:72
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -1827,7 +1839,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:64
+#: apt-cdrom.8.xml:51
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present.  <placeholder type=\"variablelist"
@@ -1838,23 +1850,23 @@ msgstr ""
 "\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:161
+#: apt-cdrom.8.xml:81 apt-key.8.xml:153
 msgid "Options"
 msgstr "Opcje"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
+#: apt-cdrom.8.xml:85 apt-ftparchive.1.xml:519 apt-get.8.xml:273
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98
+#: apt-cdrom.8.xml:85
 msgid "<option>--cdrom</option>"
 msgstr "<option>--cdrom</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:99
+#: apt-cdrom.8.xml:86
 msgid ""
 "Mount point; specify the location to mount the cdrom. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -1866,18 +1878,18 @@ msgstr ""
 "<literal>Acquire::cdrom::mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
+#: apt-cdrom.8.xml:94
 msgid "<option>-r</option>"
 msgstr "<option>-r</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
+#: apt-cdrom.8.xml:94
 msgid "<option>--rename</option>"
 msgstr "<option>--rename</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:108
+#: apt-cdrom.8.xml:95
 msgid ""
 "Rename a disc; change the label of a disk or override the disks given label. "
 "This option will cause <command>apt-cdrom</command> to prompt for a new "
@@ -1889,18 +1901,18 @@ msgstr ""
 "CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116 apt-get.8.xml:375
+#: apt-cdrom.8.xml:103 apt-get.8.xml:292
 msgid "<option>-m</option>"
 msgstr "<option>-m</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116
+#: apt-cdrom.8.xml:103
 msgid "<option>--no-mount</option>"
 msgstr "<option>--no-mount</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:117
+#: apt-cdrom.8.xml:104
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -1911,13 +1923,13 @@ msgstr ""
 "CDROM::NoMount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:124
+#: apt-cdrom.8.xml:111
 msgid "<option>--fast</option>"
 msgstr "<option>--fast</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:125
+#: apt-cdrom.8.xml:112
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1931,13 +1943,13 @@ msgstr ""
 "CDROM::Fast</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:134
+#: apt-cdrom.8.xml:121
 msgid "<option>--thorough</option>"
 msgstr "<option>--thorough</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:135
+#: apt-cdrom.8.xml:122
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1949,23 +1961,23 @@ msgstr ""
 "znajdzie wszystkie takie pliki."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:143 apt-get.8.xml:406
+#: apt-cdrom.8.xml:130 apt-get.8.xml:323
 msgid "<option>--just-print</option>"
 msgstr "<option>--just-print</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:144 apt-get.8.xml:408
+#: apt-cdrom.8.xml:131 apt-get.8.xml:325
 msgid "<option>--recon</option>"
 msgstr "<option>--recon</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:145 apt-get.8.xml:409
+#: apt-cdrom.8.xml:132 apt-get.8.xml:326
 msgid "<option>--no-act</option>"
 msgstr "<option>--no-act</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:133
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -1977,13 +1989,13 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:159
+#: apt-cdrom.8.xml:146
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:164
+#: apt-cdrom.8.xml:151
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2012,21 +2024,8 @@ msgstr "apt-config"
 msgid "APT Configuration Query program"
 msgstr "Program odpytywania konfiguracji APT"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-config.8.xml:39
-msgid ""
-"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>shell</arg> <arg>dump</arg> </group>"
-msgstr ""
-"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
-"o=<replaceable>opcja konfiguracji</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>plik</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>shell</arg> <arg>dump</arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:51
+#: apt-config.8.xml:39
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -2040,7 +2039,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:56 apt-ftparchive.1.xml:75
+#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present."
@@ -2049,12 +2048,12 @@ msgstr ""
 "<option>-h</option> albo <option>--help</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:49
 msgid "shell"
 msgstr "shell"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:63
+#: apt-config.8.xml:51
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
@@ -2069,7 +2068,7 @@ msgstr ""
 "Przykład użycia w skrypcie powłoki:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:71
+#: apt-config.8.xml:59
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -2081,7 +2080,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:76
+#: apt-config.8.xml:64
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -2090,7 +2089,7 @@ msgstr ""
 "zmiennej MojaAplikacja::opcje, z domyślną wartością <option>-f</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:80
+#: apt-config.8.xml:68
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -2101,19 +2100,19 @@ msgstr ""
 "jest ujednolicana i weryfikowana."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:89
+#: apt-config.8.xml:77
 msgid "Just show the contents of the configuration space."
 msgstr "Wyświetla zawartość przestrzeni konfiguracji."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
-#: apt-sortpkgs.1.xml:73
+#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112
+#: apt-config.8.xml:100
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2138,20 +2137,8 @@ msgstr ""
 "Narzędzie wyciągające z pakietów Debiana skrypty konfiguracyjne i szablony "
 "DebConf"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-extracttemplates.1.xml:39
-msgid ""
-"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-"<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
-"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
-"arg>"
-msgstr ""
-"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-"<arg><option>-t=<replaceable>katalog_tymczasowy</replaceable></option></arg> "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>plik</replaceable></arg>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:39
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -2165,12 +2152,12 @@ msgstr ""
 "te skrypty i szablony, zostanie wypisana linia w następującym formacie:"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:52
+#: apt-extracttemplates.1.xml:44
 msgid "package version template-file config-script"
 msgstr "pakiet wersja plik-template skrypt-config"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:53
+#: apt-extracttemplates.1.xml:45
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
@@ -2184,17 +2171,17 @@ msgstr ""
 "config.XXXX</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63 apt-get.8.xml:525
+#: apt-extracttemplates.1.xml:55 apt-get.8.xml:447
 msgid "<option>-t</option>"
 msgstr "<option>-t</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63
+#: apt-extracttemplates.1.xml:55
 msgid "<option>--tempdir</option>"
 msgstr "<option>--tempdir</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:65
+#: apt-extracttemplates.1.xml:57
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@ -2206,7 +2193,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:82
+#: apt-extracttemplates.1.xml:74
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -2234,71 +2221,8 @@ msgstr "apt-ftparchive"
 msgid "Utility to generate index files"
 msgstr "Narzędzie użytkowe do generowania plików indeksu"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-ftparchive.1.xml:39
-#, fuzzy
-#| msgid ""
-#| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-#| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-#| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-#| "arg> <arg><option>-o <replaceable>config</"
-#| "replaceable>=<replaceable>string</replaceable></option></arg> "
-#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#| "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-#| "replaceable></arg><arg><replaceable>override</"
-#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
-#| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
-#| "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-#| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
-#| "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
-#| "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
-#| "group>"
-msgid ""
-"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
-"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
-"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
-"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-"replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
-"arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
-"arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
-"replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
-"\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
-msgstr ""
-"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-"arg> <arg><option>-o <replaceable>opcja_konfiguracji</"
-"replaceable>=<replaceable>łańcuch_znaków</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>plik</replaceable></option></arg> <group choice="
-"\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>ścieżka</replaceable></arg><arg><replaceable>plik_nadpisań</"
-"replaceable><arg><replaceable>prefiks_ścieżki</replaceable></arg></arg></"
-"arg> <arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>ścieżka</"
-"replaceable></arg><arg><replaceable>plik_nadpisań</"
-"replaceable><arg><replaceable>prefiks_ścieżki</replaceable></arg></arg></"
-"arg> <arg>contents <arg choice=\"plain\"><replaceable>ścieżka</replaceable></"
-"arg></arg> <arg>release <arg choice=\"plain\"><replaceable>ścieżka</"
-"replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-"\"><replaceable>plik_konfiguracji</replaceable></arg> <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>sekcja</replaceable></arg></arg> <arg>clean <arg "
-"choice=\"plain\"><replaceable>plik_konfiguracji</replaceable></arg></arg> </"
-"group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -2307,7 +2231,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:64
+#: apt-ftparchive.1.xml:43
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -2317,7 +2241,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:70
+#: apt-ftparchive.1.xml:49
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -2327,12 +2251,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:79
+#: apt-ftparchive.1.xml:58
 msgid "packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:81
+#: apt-ftparchive.1.xml:60
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -2341,18 +2265,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
+#: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:89
+#: apt-ftparchive.1.xml:68
 msgid "sources"
 msgstr "sources"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:70
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -2361,7 +2285,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:75
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -2369,12 +2293,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:101
+#: apt-ftparchive.1.xml:80
 msgid "contents"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:103
+#: apt-ftparchive.1.xml:82
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -2385,12 +2309,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:113
+#: apt-ftparchive.1.xml:92
 msgid "release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:115
+#: apt-ftparchive.1.xml:94
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -2405,7 +2329,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:125
+#: apt-ftparchive.1.xml:104
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -2418,12 +2342,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:115
 msgid "generate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:138
+#: apt-ftparchive.1.xml:117
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -2433,25 +2357,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
+#: apt-ftparchive.1.xml:124 apt-get.8.xml:215
 msgid "clean"
 msgstr "clean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:126
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:153
+#: apt-ftparchive.1.xml:132
 #, fuzzy
 msgid "The Generate Configuration"
 msgstr "Plik konfiguracyjny"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:134
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -2462,18 +2386,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:163
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:144
 msgid "Dir Section"
 msgstr "Dir Section"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:146
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -2482,12 +2406,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:151
 msgid "ArchiveDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:153
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2495,44 +2419,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:179
+#: apt-ftparchive.1.xml:158
 msgid "OverrideDir"
 msgstr "OverrideDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:160
 msgid "Specifies the location of the override files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:184
+#: apt-ftparchive.1.xml:163
 msgid "CacheDir"
 msgstr "CacheDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:165
 msgid "Specifies the location of the cache files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:189
+#: apt-ftparchive.1.xml:168
 msgid "FileListDir"
 msgstr "FileListDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:170
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:176
 msgid "Default Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:199
+#: apt-ftparchive.1.xml:178
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -2540,12 +2464,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
+#: apt-ftparchive.1.xml:182
 msgid "Packages::Compress"
 msgstr "Packages::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:184
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -2554,74 +2478,74 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:190
 msgid "Packages::Extensions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:213
+#: apt-ftparchive.1.xml:192
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:196
 msgid "Sources::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:219
+#: apt-ftparchive.1.xml:198
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:202
 msgid "Sources::Extensions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:225
+#: apt-ftparchive.1.xml:204
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:208
 msgid "Contents::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:210
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:214
 #, fuzzy
 #| msgid "Packages::Compress"
 msgid "Translation::Compress"
 msgstr "Packages::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:237
+#: apt-ftparchive.1.xml:216
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
+#: apt-ftparchive.1.xml:220
 msgid "DeLinkLimit"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:222
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -2629,38 +2553,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248
+#: apt-ftparchive.1.xml:227
 msgid "FileMode"
 msgstr "FileMode"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:229
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
+#: apt-ftparchive.1.xml:234 apt-ftparchive.1.xml:380
 #, fuzzy
 #| msgid "Description"
 msgid "LongDescription"
 msgstr "Opis"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+#: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:263
+#: apt-ftparchive.1.xml:242
 msgid "TreeDefault Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml:244
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -2668,12 +2592,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:249
 msgid "MaxContentsChange"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:272
+#: apt-ftparchive.1.xml:251
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -2681,12 +2605,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:256
 msgid "ContentsAge"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:279
+#: apt-ftparchive.1.xml:258
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -2697,62 +2621,62 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:267
 msgid "Directory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:290
+#: apt-ftparchive.1.xml:269
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:273
 msgid "SrcDirectory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:296
+#: apt-ftparchive.1.xml:275
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:418
 msgid "Packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:281
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:306 apt-ftparchive.1.xml:444
+#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:423
 msgid "Sources"
 msgstr "Sources"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:287
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
+#: apt-ftparchive.1.xml:291
 #, fuzzy
 #| msgid "Operation"
 msgid "Translation"
 msgstr "Kolejne kroki"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:293
 msgid ""
 "Set the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
@@ -2760,12 +2684,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319
+#: apt-ftparchive.1.xml:298
 msgid "InternalPrefix"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:300
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -2773,12 +2697,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:305 apt-ftparchive.1.xml:429
 msgid "Contents"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:307
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
@@ -2787,34 +2711,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:314
 msgid "Contents::Header"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:316
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:340 apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:454
 msgid "BinCacheDB"
 msgstr "BinCacheDB"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:342
+#: apt-ftparchive.1.xml:321
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:325
 msgid "FileList"
 msgstr "FileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:327
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -2822,12 +2746,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:353
+#: apt-ftparchive.1.xml:332
 msgid "SourceFileList"
 msgstr "SourceFileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:355
+#: apt-ftparchive.1.xml:334
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -2836,12 +2760,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:342
 msgid "Tree Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:365
+#: apt-ftparchive.1.xml:344
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -2851,7 +2775,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:349
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -2860,7 +2784,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:375
+#: apt-ftparchive.1.xml:354
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
@@ -2868,7 +2792,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:381
+#: apt-ftparchive.1.xml:360
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -2882,7 +2806,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:378
+#: apt-ftparchive.1.xml:357
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -2890,12 +2814,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
+#: apt-ftparchive.1.xml:366
 msgid "Sections"
 msgstr "Sections"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389
+#: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"
@@ -2903,12 +2827,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
+#: apt-ftparchive.1.xml:373 apt.conf.5.xml:157
 msgid "Architectures"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:375
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -2916,57 +2840,57 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:434
 #, fuzzy
 msgid "BinOverride"
 msgstr "BinOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:388
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:439
 msgid "SrcOverride"
 msgstr "SrcOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:415
+#: apt-ftparchive.1.xml:394
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
+#: apt-ftparchive.1.xml:398 apt-ftparchive.1.xml:444
 msgid "ExtraOverride"
 msgstr "ExtraOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
 msgid "Sets the binary extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:424 apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:403 apt-ftparchive.1.xml:449
 msgid "SrcExtraOverride"
 msgstr "SrcExtraOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
+#: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
 msgid "Sets the source extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:431
+#: apt-ftparchive.1.xml:410
 msgid "BinDirectory Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:412
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -2976,65 +2900,65 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:441
+#: apt-ftparchive.1.xml:420
 msgid "Sets the Packages file output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:446
+#: apt-ftparchive.1.xml:425
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml:431
 msgid "Sets the Contents file output. (optional)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:457
+#: apt-ftparchive.1.xml:436
 msgid "Sets the binary override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:441
 msgid "Sets the source override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:477
+#: apt-ftparchive.1.xml:456
 msgid "Sets the cache DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:459
 msgid "PathPrefix"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:461
 msgid "Appends a path to all the output paths."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:464
 msgid "FileList, SourceFileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:466
 msgid "Specifies the file list file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:473
 #, fuzzy
 msgid "The Binary Override File"
 msgstr "Wprowadzenie"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:495
+#: apt-ftparchive.1.xml:474
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -3044,19 +2968,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:480
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:482
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:500
+#: apt-ftparchive.1.xml:479
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3067,13 +2991,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:490
 #, fuzzy
 msgid "The Source Override File"
 msgstr "Wprowadzenie"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:513
+#: apt-ftparchive.1.xml:492
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -3081,12 +3005,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:497
 msgid "The Extra Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:520
+#: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -3094,13 +3018,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:508
 msgid ""
 "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml:510
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -3114,13 +3038,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:540
+#: apt-ftparchive.1.xml:519
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:521
 #, fuzzy
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
@@ -3131,7 +3055,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:548
+#: apt-ftparchive.1.xml:527
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3145,13 +3069,13 @@ msgstr ""
 "pliku konfiguracyjnym: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:554
+#: apt-ftparchive.1.xml:533
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:556
+#: apt-ftparchive.1.xml:535
 #, fuzzy
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
@@ -3165,12 +3089,12 @@ msgstr ""
 "<literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:562
+#: apt-ftparchive.1.xml:541
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:564
+#: apt-ftparchive.1.xml:543
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3180,13 +3104,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:572
+#: apt-ftparchive.1.xml:551
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:553
 #, fuzzy
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
@@ -3198,13 +3122,13 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:578
+#: apt-ftparchive.1.xml:557
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:559
 #, fuzzy
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
@@ -3214,14 +3138,14 @@ msgstr ""
 "pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:584
+#: apt-ftparchive.1.xml:563
 #, fuzzy
 #| msgid "<option>-a</option>"
 msgid "<option>--arch</option>"
 msgstr "<option>-a</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:585
+#: apt-ftparchive.1.xml:564
 #, fuzzy
 #| msgid ""
 #| "If the command is either <literal>install</literal> or <literal>remove</"
@@ -3241,13 +3165,13 @@ msgstr ""
 "AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:591
+#: apt-ftparchive.1.xml:570
 #, fuzzy
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>--version</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:593
+#: apt-ftparchive.1.xml:572
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3261,13 +3185,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:603
+#: apt-ftparchive.1.xml:582
 #, fuzzy
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>--version</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:605
+#: apt-ftparchive.1.xml:584
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3277,19 +3201,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544
-#: sources.list.5.xml:209
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1104 apt_preferences.5.xml:544
+#: sources.list.5.xml:214
 msgid "Examples"
 msgstr "Przykłady"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:623
+#: apt-ftparchive.1.xml:602
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>katalog</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:619
+#: apt-ftparchive.1.xml:598
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3297,7 +3221,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:633
+#: apt-ftparchive.1.xml:612
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3326,107 +3250,9 @@ msgstr "apt-get"
 msgid "APT package handling utility -- command-line interface"
 msgstr "Narzędzie zarządzania pakietami APT -- interfejs linii poleceń"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-get.8.xml:39
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
-#| "<arg> <option>-t=</option> <group choice='req'> <arg choice='plain'> "
-#| "<replaceable>target_release_name</replaceable> </arg> <arg "
-#| "choice='plain'> <replaceable>target_release_number_expression</"
-#| "replaceable> </arg> <arg choice='plain'> "
-#| "<replaceable>target_release_codename</replaceable> </arg> </group> </arg> "
-#| "<group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-#| "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> "
-#| "<arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#| "<group choice='req'> <arg choice='plain'> "
-#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
-#| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
-#| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#| "<group choice='req'> <arg choice='plain'> "
-#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
-#| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
-#| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#| "arg> <arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#| "help</arg> </group> </arg> </group>"
-msgid ""
-"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
-"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
-"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
-"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> "
-"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice="
-"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
-"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
-"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
-"arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
-"<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-"<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
-"</group> </arg> </group>"
-msgstr ""
-"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>opcja_konfiguracji</replaceable> </option> </arg> "
-"<arg> <option>-c= <replaceable>plik_konfiguracyjny</replaceable> </option> </"
-"arg> <arg> <option>-t=</option> <group choice='req'> <arg choice='plain'> "
-"<replaceable>nazwa_wydania</replaceable> </arg> <arg choice='plain'> "
-"<replaceable>wyrażenie_numeru_wydania</replaceable> </arg> <arg "
-"choice='plain'> <replaceable>kod_wydania</replaceable> </arg> </group> </"
-"arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
-"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable> <arg> <group "
-"choice='req'> <arg choice='plain'> =<replaceable>numer_wersji_pakietu</"
-"replaceable> </arg> <arg choice='plain'> /<replaceable>nazwa_wydania</"
-"replaceable> </arg> <arg choice='plain'> /<replaceable>kod_wydania</"
-"replaceable> </arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></"
-"arg></arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pakiet</replaceable></arg></arg> <arg choice='plain'>source "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable> <arg> "
-"<group choice='req'> <arg choice='plain'> "
-"=<replaceable>numer_wersji_pakietu</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>nazwa_wydania</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>kod_wydania</replaceable> </arg> </group> </"
-"arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>pakiet</replaceable></arg></arg> <arg "
-"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
-"</group> </arg> </group>"
-
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:122
+#: apt-get.8.xml:39
 #, fuzzy
 #| msgid ""
 #| "<command>apt-get</command> is the command-line tool for handling "
@@ -3446,13 +3272,13 @@ msgstr ""
 "&wajig;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:131 apt-key.8.xml:127
+#: apt-get.8.xml:48 apt-key.8.xml:119
 msgid "update"
 msgstr "update"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:132
+#: apt-get.8.xml:49
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -3476,13 +3302,13 @@ msgstr ""
 "<filename>Packages.gz</filename> nie jest wcześniej znany."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:143 guide.sgml:121
+#: apt-get.8.xml:60 guide.sgml:121
 msgid "upgrade"
 msgstr "upgrade"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:144
+#: apt-get.8.xml:61
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -3507,13 +3333,13 @@ msgstr ""
 "wcześniej wykonać <literal>update</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:156
+#: apt-get.8.xml:73
 msgid "dselect-upgrade"
 msgstr "dselect-upgrade"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:157
+#: apt-get.8.xml:74
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -3531,13 +3357,13 @@ msgstr ""
 "nowych)."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:166 guide.sgml:140
+#: apt-get.8.xml:83 guide.sgml:140
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:167
+#: apt-get.8.xml:84
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3561,13 +3387,13 @@ msgstr ""
 "poszczególnych pakietów."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:179 guide.sgml:131
+#: apt-get.8.xml:96 guide.sgml:131
 msgid "install"
 msgstr "install"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:181
+#: apt-get.8.xml:98
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -3597,7 +3423,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:116
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -3615,7 +3441,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:123
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -3625,7 +3451,7 @@ msgstr ""
 "ostrożnie."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:209
+#: apt-get.8.xml:126
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -3646,7 +3472,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:220
+#: apt-get.8.xml:137
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -3656,7 +3482,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:141
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -3677,13 +3503,13 @@ msgstr ""
 "lub \"$\", można też stworzyć bardziej specyficzne wyrażenie regularne."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:233
+#: apt-get.8.xml:150
 msgid "remove"
 msgstr "remove"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:151
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -3697,12 +3523,12 @@ msgstr ""
 "pakiet zostanie zainstalowany zamiast zostać usunięty."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:241
+#: apt-get.8.xml:158
 msgid "purge"
 msgstr "purge"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:242
+#: apt-get.8.xml:159
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -3713,13 +3539,13 @@ msgstr ""
 "wszystkie pliki konfiguracyjne)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:163
 msgid "source"
 msgstr "source"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:247
+#: apt-get.8.xml:164
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -3739,7 +3565,7 @@ msgstr ""
 "wydanie</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:255
+#: apt-get.8.xml:172
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> type lines in the &sources-list; file. This means that you "
@@ -3755,7 +3581,7 @@ msgstr ""
 "jest zainstalowana lub możliwa do zainstalowania."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:179
 #, fuzzy
 #| msgid ""
 #| "If the <option>--compile</option> option is specified then the package "
@@ -3776,7 +3602,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:186
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -3792,7 +3618,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:275
+#: apt-get.8.xml:192
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -3803,13 +3629,13 @@ msgstr ""
 "ściągnięte oryginalne źródła programu ze strony jego autorów."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:280
+#: apt-get.8.xml:197
 msgid "build-dep"
 msgstr "build-dep"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:281
+#: apt-get.8.xml:198
 #, fuzzy
 #| msgid ""
 #| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
@@ -3826,13 +3652,13 @@ msgstr ""
 "źródłowego."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
+#: apt-get.8.xml:204
 msgid "check"
 msgstr "check"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:205
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -3841,12 +3667,12 @@ msgstr ""
 "bufor (cache) pakietów i szuka zepsutych pakietów."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:209
 msgid "download"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:210
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
@@ -3854,7 +3680,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:299
+#: apt-get.8.xml:216
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -3873,13 +3699,13 @@ msgstr ""
 "literal>, aby zwolnić trochę miejsca na dysku."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:225
 msgid "autoclean"
 msgstr "autoclean"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:309
+#: apt-get.8.xml:226
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -3899,12 +3725,12 @@ msgstr ""
 "zawierających zainstalowane pakiety."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:318
+#: apt-get.8.xml:235
 msgid "autoremove"
 msgstr "autoremove"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
+#: apt-get.8.xml:236
 #, fuzzy
 #| msgid ""
 #| "<literal>autoremove</literal> is used to remove packages that were "
@@ -3920,12 +3746,12 @@ msgstr ""
 "potrzebne."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323
+#: apt-get.8.xml:240
 msgid "changelog"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:241
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -3938,12 +3764,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:346
+#: apt-get.8.xml:263
 msgid "<option>--no-install-recommends</option>"
 msgstr "<option>--no-install-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:264
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -3952,14 +3778,14 @@ msgstr ""
 "Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:351
+#: apt-get.8.xml:268
 #, fuzzy
 #| msgid "<option>--no-upgrade</option>"
 msgid "<option>--install-suggests</option>"
 msgstr "<option>--no-upgrade</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml:269
 #, fuzzy
 #| msgid ""
 #| "Do not consider recommended packages as a dependency for installing.  "
@@ -3972,13 +3798,13 @@ msgstr ""
 "Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:356
+#: apt-get.8.xml:273
 msgid "<option>--download-only</option>"
 msgstr "<option>--download-only</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:357
+#: apt-get.8.xml:274
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -3988,13 +3814,13 @@ msgstr ""
 "Download-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:361
+#: apt-get.8.xml:278
 msgid "<option>--fix-broken</option>"
 msgstr "<option>--fix-broken</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:362
+#: apt-get.8.xml:279
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
@@ -4021,18 +3847,18 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:375
+#: apt-get.8.xml:292
 msgid "<option>--ignore-missing</option>"
 msgstr "<option>--ignore-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:376
+#: apt-get.8.xml:293
 msgid "<option>--fix-missing</option>"
 msgstr "<option>--fix-missing</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:294
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -4051,13 +3877,13 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Get::Fix-Missing</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:387
+#: apt-get.8.xml:304
 msgid "<option>--no-download</option>"
 msgstr "<option>--no-download</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:388
+#: apt-get.8.xml:305
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -4070,7 +3896,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:395
+#: apt-get.8.xml:312
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -4090,18 +3916,18 @@ msgstr ""
 "spodziewa.  Pozycja w pliku konfiguracyjnym: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:405
+#: apt-get.8.xml:322
 msgid "<option>--simulate</option>"
 msgstr "<option>--simulate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:407
+#: apt-get.8.xml:324
 msgid "<option>--dry-run</option>"
 msgstr "<option>--dry-run</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:410
+#: apt-get.8.xml:327
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -4112,7 +3938,7 @@ msgstr ""
 "Get::Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:331
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "
@@ -4132,7 +3958,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:337
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4146,23 +3972,23 @@ msgstr ""
 "znana (rzadkość)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:344
 msgid "<option>-y</option>"
 msgstr "<option>-y</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:344
 msgid "<option>--yes</option>"
 msgstr "<option>--yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:428
+#: apt-get.8.xml:345
 msgid "<option>--assume-yes</option>"
 msgstr "<option>--assume-yes</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:429
+#: apt-get.8.xml:346
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -4178,18 +4004,39 @@ msgstr ""
 "Assume-Yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:353
+#, fuzzy
+#| msgid "<option>--assume-yes</option>"
+msgid "<option>--assume-no</option>"
+msgstr "<option>--assume-yes</option>"
+
+#
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:354
+#, fuzzy
+#| msgid ""
+#| "Compile source packages after downloading them.  Configuration Item: "
+#| "<literal>APT::Get::Compile</literal>."
+msgid ""
+"Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
+"Assume-No</literal>."
+msgstr ""
+"Skompiluj pakiety źródłowe po ich ściągnięciu.  Pozycja w pliku "
+"konfiguracyjnym: <literal>APT::Get::Compile</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:358
 msgid "<option>-u</option>"
 msgstr "<option>-u</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:358
 msgid "<option>--show-upgraded</option>"
 msgstr "<option>--show-upgraded</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:437
+#: apt-get.8.xml:359
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4199,18 +4046,18 @@ msgstr ""
 "Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:364
 msgid "<option>-V</option>"
 msgstr "<option>-V</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:364
 msgid "<option>--verbose-versions</option>"
 msgstr "<option>--verbose-versions</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:365
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -4219,14 +4066,14 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Get::Show-Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:370
 #, fuzzy
 #| msgid "<option>--recurse</option>"
 msgid "<option>--host-architecture</option>"
 msgstr "<option>--recurse</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:371
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
@@ -4237,23 +4084,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:379
 msgid "<option>-b</option>"
 msgstr "<option>-b</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:379
 msgid "<option>--compile</option>"
 msgstr "<option>--compile</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:458
+#: apt-get.8.xml:380
 msgid "<option>--build</option>"
 msgstr "<option>--build</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:459
+#: apt-get.8.xml:381
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -4262,13 +4109,13 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:385
 msgid "<option>--ignore-hold</option>"
 msgstr "<option>--ignore-hold</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:464
+#: apt-get.8.xml:386
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -4282,13 +4129,13 @@ msgstr ""
 "<literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:470
+#: apt-get.8.xml:392
 msgid "<option>--no-upgrade</option>"
 msgstr "<option>--no-upgrade</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:393
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4301,7 +4148,7 @@ msgstr ""
 "<literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:477
+#: apt-get.8.xml:399
 #, fuzzy
 #| msgid "<option>--no-upgrade</option>"
 msgid "<option>--only-upgrade</option>"
@@ -4309,7 +4156,7 @@ msgstr "<option>--no-upgrade</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:478
+#: apt-get.8.xml:400
 #, fuzzy
 #| msgid ""
 #| "Do not upgrade packages; When used in conjunction with <literal>install</"
@@ -4328,13 +4175,13 @@ msgstr ""
 "<literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:484
+#: apt-get.8.xml:406
 msgid "<option>--force-yes</option>"
 msgstr "<option>--force-yes</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:485
+#: apt-get.8.xml:407
 msgid ""
 "Force yes; This is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -4350,13 +4197,13 @@ msgstr ""
 "force-yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:492
+#: apt-get.8.xml:414
 msgid "<option>--print-uris</option>"
 msgstr "<option>--print-uris</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:493
+#: apt-get.8.xml:415
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected md5 "
@@ -4378,13 +4225,13 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:503
+#: apt-get.8.xml:425
 msgid "<option>--purge</option>"
 msgstr "<option>--purge</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:504
+#: apt-get.8.xml:426
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -4398,13 +4245,13 @@ msgstr ""
 "pliku konfiguracyjnym: <literal>APT::Get::Purge</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
+#: apt-get.8.xml:433
 msgid "<option>--reinstall</option>"
 msgstr "<option>--reinstall</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:434
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4413,13 +4260,13 @@ msgstr ""
 "Pozycja w pliku konfiguracyjnym: <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:516
+#: apt-get.8.xml:438
 msgid "<option>--list-cleanup</option>"
 msgstr "<option>--list-cleanup</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:517
+#: apt-get.8.xml:439
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -4436,18 +4283,18 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:448
 msgid "<option>--target-release</option>"
 msgstr "<option>--target-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:527
+#: apt-get.8.xml:449
 msgid "<option>--default-release</option>"
 msgstr "<option>--default-release</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:450
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -4470,13 +4317,13 @@ msgstr ""
 "stronę podręcznika &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:541
+#: apt-get.8.xml:463
 msgid "<option>--trivial-only</option>"
 msgstr "<option>--trivial-only</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:465
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4490,13 +4337,13 @@ msgstr ""
 "Get::Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
+#: apt-get.8.xml:471
 msgid "<option>--no-remove</option>"
 msgstr "<option>--no-remove</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:550
+#: apt-get.8.xml:472
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4506,12 +4353,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:477
 msgid "<option>--auto-remove</option>"
 msgstr "<option>--auto-remove</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:556
+#: apt-get.8.xml:478
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4525,13 +4372,13 @@ msgstr ""
 "AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:562
+#: apt-get.8.xml:484
 msgid "<option>--only-source</option>"
 msgstr "<option>--only-source</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:563
+#: apt-get.8.xml:485
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -4550,23 +4397,23 @@ msgstr ""
 "Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--diff-only</option>"
 msgstr "<option>--diff-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--dsc-only</option>"
 msgstr "<option>--dsc-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--tar-only</option>"
 msgstr "<option>--tar-only</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:574
+#: apt-get.8.xml:496
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4577,13 +4424,13 @@ msgstr ""
 "Dsc-Only</literal> oraz <literal>APT::Get::Tar-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:579
+#: apt-get.8.xml:501
 msgid "<option>--arch-only</option>"
 msgstr "<option>--arch-only</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:580
+#: apt-get.8.xml:502
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -4594,12 +4441,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:584
+#: apt-get.8.xml:506
 msgid "<option>--allow-unauthenticated</option>"
 msgstr "<option>--allow-unauthenticated</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:585
+#: apt-get.8.xml:507
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -4610,7 +4457,7 @@ msgstr ""
 "w pliku konfiguracyjnym: <literal>APT::Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:598
+#: apt-get.8.xml:520
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
@@ -4620,7 +4467,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:607
+#: apt-get.8.xml:529
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -4632,7 +4479,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:613
+#: apt-get.8.xml:535
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -4641,22 +4488,22 @@ msgstr ""
 "w przypadku błędu."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:616
+#: apt-get.8.xml:538
 msgid "ORIGINAL AUTHORS"
 msgstr "AUTORZY ORYGINAŁU"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:617
+#: apt-get.8.xml:539
 msgid "&apt-author.jgunthorpe;"
 msgstr "&apt-author.jgunthorpe;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:620
+#: apt-get.8.xml:542
 msgid "CURRENT AUTHORS"
 msgstr "OBECNI AUTORZY"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:622
+#: apt-get.8.xml:544
 msgid "&apt-author.team;"
 msgstr "&apt-author.team;"
 
@@ -4671,21 +4518,8 @@ msgstr "apt-key"
 msgid "APT key management utility"
 msgstr "Narzędzie zarządzanie kluczami APT"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-key.8.xml:31
-msgid ""
-"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
-"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
-"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
-"arg>"
-msgstr ""
-"<command>apt-key</command> <arg><option>--keyring <replaceable>nazwa_pliku</"
-"replaceable></option></arg> <arg><replaceable>polecenie</replaceable></arg> "
-"<arg rep=\"powtórzenia\"><option><replaceable>argumenty</replaceable></"
-"option></arg>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:40
+#: apt-key.8.xml:32
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -4697,85 +4531,92 @@ msgstr ""
 "zaufane."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:46
+#: apt-key.8.xml:38
 msgid "Commands"
 msgstr "Polecenia"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:48
-msgid "add <replaceable>filename</replaceable>"
-msgstr "add <replaceable>nazwa_pliku</replaceable>"
+#: apt-key.8.xml:40
+msgid "add &synopsis-param-filename;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:44
+#, fuzzy
+#| msgid ""
+#| "Add a new key to the list of trusted keys.  The key is read from "
+#| "<replaceable>filename</replaceable>, or standard input if "
+#| "<replaceable>filename</replaceable> is <literal>-</literal>."
 msgid ""
-"Add a new key to the list of trusted keys.  The key is read from "
-"<replaceable>filename</replaceable>, or standard input if "
-"<replaceable>filename</replaceable> is <literal>-</literal>."
+"Add a new key to the list of trusted keys.  The key is read from &synopsis-"
+"param-filename;, or standard input if &synopsis-param-filename; is <literal>-"
+"</literal>."
 msgstr ""
 "Dodaje nowy klucz do listy zaufanych kluczy.Klucz jest czytany z podanej "
 "<replaceable>nazwy_pliku</replaceable> lub ze standardowego wejścia, jeśli "
 "zamiast <replaceable>nazwy_pliku</replaceable> podano <literal>-</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:60
-msgid "del <replaceable>keyid</replaceable>"
-msgstr "del <replaceable>id_klucza</replaceable>"
+#: apt-key.8.xml:52
+msgid "del &synopsis-param-keyid;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:64
+#: apt-key.8.xml:56
 msgid "Remove a key from the list of trusted keys."
 msgstr "Usuwa klucz z listy zaufanych kluczy."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:71
-msgid "export <replaceable>keyid</replaceable>"
-msgstr "export <replaceable>id_klucza</replaceable>"
+#: apt-key.8.xml:63
+msgid "export &synopsis-param-keyid;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:75
-msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+#: apt-key.8.xml:67
+#, fuzzy
+#| msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr ""
 "Wyświetla klucz o podanym <replaceable>id_klucza</replaceable> na "
 "standardowe wyjście."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:74
 msgid "exportall"
 msgstr "exportall"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:86
+#: apt-key.8.xml:78
 msgid "Output all trusted keys to standard output."
 msgstr "Wypisuje na standardowe wyjście wszystkie zaufane klucze."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:85
 msgid "list"
 msgstr "list"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:97
+#: apt-key.8.xml:89
 msgid "List trusted keys."
 msgstr "Wyświetla listę zaufanych kluczy."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:96
 msgid "finger"
 msgstr "finger"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:108
+#: apt-key.8.xml:100
 msgid "List fingerprints of trusted keys."
 msgstr "Wyświetla listę odcisków zaufanych kluczy."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:107
 msgid "adv"
 msgstr "adv"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:119
+#: apt-key.8.xml:111
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -4784,7 +4625,7 @@ msgstr ""
 "pobranie klucza publicznego."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:131
+#: apt-key.8.xml:123
 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 "
@@ -4794,14 +4635,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:141
+#: apt-key.8.xml:133
 #, fuzzy
 #| msgid "update"
 msgid "net-update"
 msgstr "update"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:137
 msgid ""
 "Work similar to the <command>update</command> command above, but get the "
 "archive keyring from an URI instead and validate it against a master key.  "
@@ -4812,7 +4653,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:154
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -4821,12 +4662,20 @@ msgstr ""
 "opisanymi w poprzednim rozdziale."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:164
-msgid "--keyring <replaceable>filename</replaceable>"
-msgstr "--keyring <replaceable>nazwa_pliku</replaceable>"
+#: apt-key.8.xml:156
+msgid "--keyring &synopsis-param-filename;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:165
+#: apt-key.8.xml:157
+#, fuzzy
+#| msgid ""
+#| "With this option it is possible to specify a specific keyring file the "
+#| "command should operate on. The default is that a command is executed on "
+#| "the <filename>trusted.gpg</filename> file as well as on all parts in the "
+#| "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
+#| "gpg</filename> is the primary keyring which means that e.g. new keys are "
+#| "added to this one."
 msgid ""
 "With this option it is possible to specify a specific keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -4842,44 +4691,44 @@ msgstr ""
 "kluczy, co oznacza na przykład to, że nowe klucze będą dodawane właśnie tam."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:178
+#: apt-key.8.xml:170
 msgid "&file-trustedgpg;"
 msgstr "&file-trustedgpg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:180
+#: apt-key.8.xml:172
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:173
 msgid "Local trust database of archive keys."
 msgstr "Lokalna składnica zaufanych kluczy archiwum."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:184
+#: apt-key.8.xml:176
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:177
 msgid "Keyring of Debian archive trusted keys."
 msgstr "Składnica zaufanych kluczy archiwum Debiana."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:188
+#: apt-key.8.xml:180
 msgid ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:181
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr "Składnica usuniętych zaufanych kluczy archiwum Debiana."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:198
+#: apt-key.8.xml:190
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
@@ -4907,34 +4756,8 @@ msgstr "apt-mark"
 msgid "mark/unmark a package as being automatically-installed"
 msgstr "Zaznaczanie/odznaczanie pakietu jako zainstalowanego automatycznie."
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-mark.8.xml:39
-#, fuzzy
-#| msgid ""
-#| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
-#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
-#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
-msgid ""
-"  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
-"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
-"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> </group>"
-msgstr ""
-"  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-"f=<replaceable>NAZWA_PLIKU</replaceable></option></arg> <group choice=\"plain"
-"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:39
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -4943,7 +4766,7 @@ msgstr ""
 "zainstalowany automatycznie."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:61
+#: apt-mark.8.xml:43
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -4959,14 +4782,14 @@ msgstr ""
 "get</command> lub <command>aptitude</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:51
 #, fuzzy
 #| msgid "markauto"
 msgid "auto"
 msgstr "markauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:52
 #, fuzzy
 #| msgid ""
 #| "<literal>markauto</literal> is used to mark a package as being "
@@ -4982,12 +4805,12 @@ msgstr ""
 "żaden inny ręcznie zainstalowany pakiet nie będzie od niego zależał."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:59
 msgid "manual"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:78
+#: apt-mark.8.xml:60
 #, fuzzy
 #| msgid ""
 #| "<literal>unmarkauto</literal> is used to mark a package as being manually "
@@ -5003,12 +4826,12 @@ msgstr ""
 "sytuacji gdy żaden inny pakiet nie będzie od niego zależał."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:67
 msgid "hold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:68
 msgid ""
 "<literal>hold</literal> is used to mark a package as hold back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -5018,12 +4841,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:95
+#: apt-mark.8.xml:77
 msgid "unhold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:78
 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "
@@ -5037,12 +4860,12 @@ msgstr ""
 "osobnej linii."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:83
 msgid "showauto"
 msgstr "showauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:102
+#: apt-mark.8.xml:84
 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "
@@ -5058,14 +4881,14 @@ msgstr ""
 "osobnej linii."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:109
+#: apt-mark.8.xml:91
 #, fuzzy
 #| msgid "showauto"
 msgid "showmanual"
 msgstr "showauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:110
+#: apt-mark.8.xml:92
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -5073,14 +4896,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:116
+#: apt-mark.8.xml:98
 #, fuzzy
 #| msgid "showauto"
 msgid "showhold"
 msgstr "showauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:99
 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "
@@ -5094,7 +4917,7 @@ msgstr ""
 "osobnej linii."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:130
+#: apt-mark.8.xml:112
 msgid ""
 "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
@@ -5102,7 +4925,7 @@ msgstr ""
 "option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:131
+#: apt-mark.8.xml:113
 msgid ""
 "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
 "option>"
@@ -5111,7 +4934,7 @@ msgstr ""
 "option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:116
 msgid ""
 "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
 "filename> instead of the default location, which is "
@@ -5124,18 +4947,18 @@ msgstr ""
 "określonym w pliku konfiguracyjnym w pozycji<literal>Dir::State</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:146
+#: apt-mark.8.xml:128
 msgid "  &file-extended_states;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:151
+#: apt-mark.8.xml:133
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr "&apt-get;,&aptitude;,&apt-conf;"
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:155
+#: apt-mark.8.xml:137
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -5385,21 +5208,8 @@ msgstr "apt-sortpkgs"
 msgid "Utility to sort package index files"
 msgstr "Narzędzie użytkowe do sortowania plików indeksu"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-sortpkgs.1.xml:39
-msgid ""
-"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-msgstr ""
-"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-"<arg><option>-o=<replaceable>opcja_konfiguracji</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>plik</replaceable></option></arg> <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>plik</replaceable></arg>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:48
+#: apt-sortpkgs.1.xml:39
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (Source index or "
 "Package index) and sort the records so that they are ordered by the package "
@@ -5411,20 +5221,20 @@ msgstr ""
 "zgodnie z wewnętrznymi zasadami sortowania."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:54
+#: apt-sortpkgs.1.xml:45
 msgid "All output is sent to stdout, the input must be a seekable file."
 msgstr ""
 "Wyjście programu jest wypisywane na standardowe wyjście, wejście musi "
 "pochodzić z pliku."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:61
+#: apt-sortpkgs.1.xml:52
 msgid "<option>--source</option>"
 msgstr "<option>--source</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:63
+#: apt-sortpkgs.1.xml:54
 msgid ""
 "Use Source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -5434,7 +5244,7 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:77
+#: apt-sortpkgs.1.xml:68
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -5992,7 +5802,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:321 sources.list.5.xml:155
+#: apt.conf.5.xml:321 sources.list.5.xml:160
 msgid "http"
 msgstr "http"
 
@@ -6096,7 +5906,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:387 sources.list.5.xml:166
+#: apt.conf.5.xml:387 sources.list.5.xml:171
 msgid "ftp"
 msgstr "ftp"
 
@@ -6149,7 +5959,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426 sources.list.5.xml:148
+#: apt.conf.5.xml:426 sources.list.5.xml:153
 msgid "cdrom"
 msgstr "cdrom"
 
@@ -8496,8 +8306,19 @@ msgid ""
 "will be downloaded."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:121
+msgid ""
+"<literal>trusted=yes</literal> can be set to indicate that packages from "
+"this source are always authenificated even if the <filename>Release</"
+"filename> file is not signed or the signature can't be checked. This "
+"disables parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context. <literal>trusted=no</literal> is the opposite which "
+"handles even correctly authenificated sources as not authenificated."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:123
+#: sources.list.5.xml:128
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -8511,12 +8332,12 @@ msgstr ""
 "komputerami w Internecie)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:128
+#: sources.list.5.xml:133
 msgid "Some examples:"
 msgstr "Kilka przykładów:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:135
 #, fuzzy, no-wrap
 #| msgid ""
 #| "deb http://http.us.debian.org/debian stable main contrib non-free\n"
@@ -8532,17 +8353,17 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:141
 msgid "URI specification"
 msgstr "Określanie URI"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:146
 msgid "file"
 msgstr "file"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:143
+#: sources.list.5.xml:148
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -8553,7 +8374,7 @@ msgstr ""
 "archiwów."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:150
+#: sources.list.5.xml:155
 msgid ""
 "The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -8563,7 +8384,7 @@ msgstr ""
 "list."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:157
+#: sources.list.5.xml:162
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -8580,7 +8401,7 @@ msgstr ""
 "bezpieczny."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:173
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
@@ -8599,12 +8420,12 @@ msgstr ""
 "używające http zostaną zignorowane."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:177
+#: sources.list.5.xml:182
 msgid "copy"
 msgstr "copy"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:179
+#: sources.list.5.xml:184
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -8616,17 +8437,17 @@ msgstr ""
 "skopiowania plików przy użyciu APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
 msgid "rsh"
 msgstr "rsh"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
 msgid "ssh"
 msgstr "ssh"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:186
+#: sources.list.5.xml:191
 msgid ""
 "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
 "user and access the files. It is a good idea to do prior arrangements with "
@@ -8642,12 +8463,12 @@ msgstr ""
 "ze zdalnego komputera."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:199
 msgid "more recognizable URI types"
 msgstr "więcej rozpoznawanych typów URI"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:196
+#: sources.list.5.xml:201
 msgid ""
 "APT can be extended with more methods shipped in other optional packages "
 "which should follow the nameing scheme <literal>apt-transport-"
@@ -8669,7 +8490,7 @@ msgstr ""
 "citerefentry>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:138
+#: sources.list.5.xml:143
 msgid ""
 "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
 "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -8678,7 +8499,7 @@ msgstr ""
 "ssh, rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:215
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -8687,36 +8508,36 @@ msgstr ""
 "debian dla zasobów stable/main, stable/contrib i stable/non-free."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:217
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:214
+#: sources.list.5.xml:219
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "Jak wyżej, z tą różnicą że używa dystrybucji niestabilnej (deweloperskiej)."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:220
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:222
 msgid "Source line for the above"
 msgstr "Linie źródeł dla powyższego przykładu"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:223
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:225
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -8724,7 +8545,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:227
 #, fuzzy, no-wrap
 #| msgid ""
 #| "deb http://http.us.debian.org/debian stable main contrib non-free\n"
@@ -8739,7 +8560,7 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:230
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -8748,13 +8569,13 @@ msgstr ""
 "org i dystrybucji hamm/main."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
+#: sources.list.5.xml:232
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:229
+#: sources.list.5.xml:234
 #, fuzzy
 #| msgid ""
 #| "Uses FTP to access the archive at ftp.debian.org, under the debian "
@@ -8767,14 +8588,14 @@ msgstr ""
 "dystrybucji stable/contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:231
+#: sources.list.5.xml:236
 #, fuzzy, no-wrap
 #| msgid "deb ftp://ftp.debian.org/debian stable contrib"
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian stable contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:238
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -8787,20 +8608,20 @@ msgstr ""
 "to pojedyncza sesja FTP będzie użyta w celu uzyskania dostępu do obu zasobów."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:246
+#: sources.list.5.xml:251
 #, fuzzy, no-wrap
 #| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:244
 #, fuzzy
 #| msgid ""
 #| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
@@ -8828,7 +8649,7 @@ msgstr ""
 "<placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:256
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache;, &apt-conf;"
 
@@ -10357,6 +10178,291 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 
+#, fuzzy
+#~| msgid ""
+#~| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
+#~| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
+#~| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> "
+#~| "<arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg "
+#~| "choice=\"plain\"><replaceable>regex</replaceable></arg></arg> <arg>show "
+#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
+#~| "arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
+#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~| "<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></"
+#~| "arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>xvcg <arg choice="
+#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~| "<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</"
+#~| "replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkgs</replaceable></arg></arg> </group>"
+#~ msgid ""
+#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
+#~ "arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> "
+#~ "<arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</"
+#~ "replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>depends <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~ "<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~ "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
+#~ "\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~ "<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
+#~ "group>"
+#~ msgstr ""
+#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
+#~ "<arg><option>-o=<replaceable>opcja_konfiguracji</replaceable></option></"
+#~ "arg> <arg><option>-c=<replaceable>plik</replaceable></option></arg> "
+#~ "<group choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>plik</replaceable></arg></arg> <arg>gencaches</arg> "
+#~ "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</"
+#~ "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pakiet</replaceable></arg></arg> <arg>stats</arg> "
+#~ "<arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg "
+#~ "choice=\"plain\"><replaceable>wyrażenie-regularne</replaceable></arg></"
+#~ "arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</"
+#~ "replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pakiet</replaceable></arg></arg> <arg>rdepends <arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></arg></"
+#~ "arg> <arg>pkgnames <arg choice=\"plain\"><replaceable>prefiks</"
+#~ "replaceable></arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pakiet</replaceable></arg></arg> <arg>xvcg <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></arg></arg> "
+#~ "<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiety</"
+#~ "replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pakiety</replaceable></arg></arg> </group>"
+
+#~ msgid ""
+#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
+#~ "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></"
+#~ "arg> <arg><option>-o=<replaceable>config string</replaceable></option></"
+#~ "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> "
+#~ "<group> <arg>add</arg> <arg>ident</arg> </group>"
+#~ msgstr ""
+#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
+#~ "<arg><option>-d=<replaceable>punkt montowania CD-ROM-u</replaceable></"
+#~ "option></arg> <arg><option>-o=<replaceable>opcja konfiguracji</"
+#~ "replaceable></option></arg> <arg><option>-c=<replaceable>plik</"
+#~ "replaceable></option></arg> <group> <arg>add</arg> <arg>identyfikator</"
+#~ "arg> </group>"
+
+#~ msgid ""
+#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
+#~ msgstr ""
+#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-o=<replaceable>opcja konfiguracji</replaceable></option></"
+#~ "arg> <arg><option>-c=<replaceable>plik</replaceable></option></arg> "
+#~ "<group choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
+
+#~ msgid ""
+#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
+#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
+#~ "replaceable></arg>"
+#~ msgstr ""
+#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-t=<replaceable>katalog_tymczasowy</replaceable></option></"
+#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>plik</"
+#~ "replaceable></arg>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
+#~| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
+#~| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+#~| "arg> <arg><option>-o <replaceable>config</"
+#~| "replaceable>=<replaceable>string</replaceable></option></arg> "
+#~| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~| "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
+#~| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#~| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
+#~| "replaceable></arg><arg><replaceable>override</"
+#~| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#~| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
+#~| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
+#~| "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
+#~| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" "
+#~| "rep=\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean "
+#~| "<arg choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> "
+#~| "</group>"
+#~ msgid ""
+#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
+#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
+#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+#~ "arg> <arg><option>--arch <replaceable>architecture</replaceable></"
+#~ "option></arg> <arg><option>-o <replaceable>config</"
+#~ "replaceable>=<replaceable>string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
+#~ "replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#~ "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
+#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
+#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
+#~ "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
+#~ "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
+#~ "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
+#~ "group>"
+#~ msgstr ""
+#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
+#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
+#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+#~ "arg> <arg><option>-o <replaceable>opcja_konfiguracji</"
+#~ "replaceable>=<replaceable>łańcuch_znaków</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>plik</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>ścieżka</replaceable></"
+#~ "arg><arg><replaceable>plik_nadpisań</"
+#~ "replaceable><arg><replaceable>prefiks_ścieżki</replaceable></arg></arg></"
+#~ "arg> <arg>sources<arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>ścieżka</replaceable></"
+#~ "arg><arg><replaceable>plik_nadpisań</"
+#~ "replaceable><arg><replaceable>prefiks_ścieżki</replaceable></arg></arg></"
+#~ "arg> <arg>contents <arg choice=\"plain\"><replaceable>ścieżka</"
+#~ "replaceable></arg></arg> <arg>release <arg choice=\"plain"
+#~ "\"><replaceable>ścieżka</replaceable></arg></arg> <arg>generate <arg "
+#~ "choice=\"plain\"><replaceable>plik_konfiguracji</replaceable></arg> <arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>sekcja</replaceable></arg></"
+#~ "arg> <arg>clean <arg choice=\"plain\"><replaceable>plik_konfiguracji</"
+#~ "replaceable></arg></arg> </group>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#~| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
+#~| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </"
+#~| "arg> <arg> <option>-t=</option> <group choice='req'> <arg "
+#~| "choice='plain'> <replaceable>target_release_name</replaceable> </arg> "
+#~| "<arg choice='plain'> <replaceable>target_release_number_expression</"
+#~| "replaceable> </arg> <arg choice='plain'> "
+#~| "<replaceable>target_release_codename</replaceable> </arg> </group> </"
+#~| "arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
+#~| "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> "
+#~| "<arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
+#~| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
+#~| "<group choice='req'> <arg choice='plain'> "
+#~| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+#~| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
+#~| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
+#~| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
+#~| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
+#~| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
+#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> "
+#~| "<arg> <group choice='req'> <arg choice='plain'> "
+#~| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+#~| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
+#~| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
+#~| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg "
+#~| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
+#~| "arg> <arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> "
+#~| "<arg choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> "
+#~| "<arg choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> "
+#~| "<arg choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#~| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#~| "help</arg> </group> </arg> </group>"
+#~ msgid ""
+#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#~ "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
+#~ "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
+#~ "<arg> <option>-t=</option> <arg choice='plain'> "
+#~ "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
+#~ "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
+#~ "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
+#~ "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
+#~ "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
+#~ "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
+#~ "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#~ "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
+#~ "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
+#~ "<group choice='req'> <arg choice='plain'> "
+#~ "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+#~ "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~ "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#~ "help</arg> </group> </arg> </group>"
+#~ msgstr ""
+#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#~ "<option>-o= <replaceable>opcja_konfiguracji</replaceable> </option> </"
+#~ "arg> <arg> <option>-c= <replaceable>plik_konfiguracyjny</replaceable> </"
+#~ "option> </arg> <arg> <option>-t=</option> <group choice='req'> <arg "
+#~ "choice='plain'> <replaceable>nazwa_wydania</replaceable> </arg> <arg "
+#~ "choice='plain'> <replaceable>wyrażenie_numeru_wydania</replaceable> </"
+#~ "arg> <arg choice='plain'> <replaceable>kod_wydania</replaceable> </arg> </"
+#~ "group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> "
+#~ "<arg choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</"
+#~ "arg> <arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable> "
+#~ "<arg> <group choice='req'> <arg choice='plain'> "
+#~ "=<replaceable>numer_wersji_pakietu</replaceable> </arg> <arg "
+#~ "choice='plain'> /<replaceable>nazwa_wydania</replaceable> </arg> <arg "
+#~ "choice='plain'> /<replaceable>kod_wydania</replaceable> </arg> </group> </"
+#~ "arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
+#~ "\"repeat\"><replaceable>pakiet</replaceable></arg></arg> <arg "
+#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pakiet</replaceable></arg></arg> <arg "
+#~ "choice='plain'>source <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pakiet</replaceable> <arg> <group choice='req'> <arg "
+#~ "choice='plain'> =<replaceable>numer_wersji_pakietu</replaceable> </arg> "
+#~ "<arg choice='plain'> /<replaceable>nazwa_wydania</replaceable> </arg> "
+#~ "<arg choice='plain'> /<replaceable>kod_wydania</replaceable> </arg> </"
+#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pakiet</replaceable></arg></arg> "
+#~ "<arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#~ "help</arg> </group> </arg> </group>"
+
+#~ msgid ""
+#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+#~ "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
+#~ "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
+#~ "option></arg>"
+#~ msgstr ""
+#~ "<command>apt-key</command> <arg><option>--keyring "
+#~ "<replaceable>nazwa_pliku</replaceable></option></arg> "
+#~ "<arg><replaceable>polecenie</replaceable></arg> <arg rep=\"powtórzenia"
+#~ "\"><option><replaceable>argumenty</replaceable></option></arg>"
+
+#~ msgid "add <replaceable>filename</replaceable>"
+#~ msgstr "add <replaceable>nazwa_pliku</replaceable>"
+
+#~ msgid "del <replaceable>keyid</replaceable>"
+#~ msgstr "del <replaceable>id_klucza</replaceable>"
+
+#~ msgid "export <replaceable>keyid</replaceable>"
+#~ msgstr "export <replaceable>id_klucza</replaceable>"
+
 #~ msgid ""
 #~ "Update the local keyring with the keyring of Debian archive keys and "
 #~ "removes from the keyring the archive keys which are no longer valid."
@@ -10365,6 +10471,44 @@ msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 #~ "Debiana i usuwa z lokalnej składnicy nieaktualne już klucze archiwów "
 #~ "Debiana."
 
+#~ msgid "--keyring <replaceable>filename</replaceable>"
+#~ msgstr "--keyring <replaceable>nazwa_pliku</replaceable>"
+
+#, fuzzy
+#~| msgid ""
+#~| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#~| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> "
+#~| "<group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> "
+#~| "<arg choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</"
+#~| "arg> </group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#~| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
+#~ msgid ""
+#~ "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
+#~ "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
+#~ "choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
+#~ "choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </"
+#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#~ "replaceable></arg> </arg> </group>"
+#~ msgstr ""
+#~ "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-f=<replaceable>NAZWA_PLIKU</replaceable></option></arg> "
+#~ "<group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> "
+#~ "<arg choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</"
+#~ "arg> </group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>pakiet</"
+#~ "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
+
+#~ msgid ""
+#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
+#~ msgstr ""
+#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
+#~ "<arg><option>-o=<replaceable>opcja_konfiguracji</replaceable></option></"
+#~ "arg> <arg><option>-c=<replaceable>plik</replaceable></option></arg> <arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>plik</replaceable></arg>"
+
 #~ msgid "<option>--md5</option>"
 #~ msgstr "<option>--md5</option>"
 
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 14f632a3b..3f7d62098 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
-"POT-Creation-Date: 2011-11-20 17:58+0100\n"
+"POT-Creation-Date: 2012-04-11 17:54+0300\n"
 "PO-Revision-Date: 2010-08-25 23:07+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -633,7 +633,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:210
+#: apt.ent:211
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -653,6 +653,101 @@ msgstr ""
 "     tradução está atrasada relativamente ao conteúdo original.\n"
 "\">\n"
 
+#. type: Plain text
+#: apt.ent:214
+msgid ""
+"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
+"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:217
+msgid ""
+"<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+"synopsis-config-file \"config_file\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:220
+msgid ""
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
+"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"\"target_release\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:223
+msgid ""
+"<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+"synopsis-architecture \"architecture\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:226
+msgid ""
+"<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+"--> <!ENTITY synopsis-pkg \"pkg\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:229
+msgid ""
+"<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
+"ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:232
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+"pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:235
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+"awesome --> <!ENTITY synopsis-regex \"regex\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:238
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
+"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:241
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
+"apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+"\"temporary_directory\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:244
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+"synopsis-filename \"filename\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:250
+msgid ""
+"<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive "
+"packages path override pathprefix --> <!ENTITY synopsis-path \"path\"> <!"
+"ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section "
+"\"section\"> <!ENTITY synopsis-override \"override\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:253
+msgid ""
+"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+msgstr ""
+
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:16
@@ -692,85 +787,17 @@ msgstr "APT"
 msgid "query the APT cache"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cache.8.xml:39
-#, fuzzy
-#| msgid ""
-#| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
-#| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
-#| "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
-#| "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice="
-#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#| "<arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice="
-#| "\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#| "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
-#| "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
-#| "group>"
-msgid ""
-"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
-"<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
-"arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></arg></"
-"arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>policy <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></"
-"arg> </group>"
-msgstr ""
-"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
-"o=<replaceable>string de configuração</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>ficheiro</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>ficheiro</replaceable></arg></arg> <arg>gencaches</arg> "
-"<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</"
-"replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pacote</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
-"arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
-"\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pacote</replaceable></arg></arg> <arg>depends "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></"
-"arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pacote</replaceable></arg></arg> <arg>pkgnames <arg choice="
-"\"plain\"><replaceable>prefixo</replaceable></arg></arg> <arg>dotty <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></arg></"
-"arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</"
-"replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pacotes</replaceable></arg></arg> <arg>madison <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pacotes</replaceable></arg></arg> </"
-"group>"
-
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
-#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121
-#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
-#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
+#: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38
+#: apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38
+#: apt-key.8.xml:30 apt-mark.8.xml:38 apt-secure.8.xml:43
+#: apt-sortpkgs.1.xml:38 apt.conf.5.xml:42 apt_preferences.5.xml:36
 #: sources.list.5.xml:36
 msgid "Description"
 msgstr "Descrição"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:65
+#: apt-cache.8.xml:39
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -783,7 +810,7 @@ msgstr ""
 "a partir dos metadados do pacote."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:70 apt-get.8.xml:127
+#: apt-cache.8.xml:44 apt-get.8.xml:44
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -792,12 +819,12 @@ msgstr ""
 "fornecida, um dos comandos abaixo têm que estar presentes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:74
+#: apt-cache.8.xml:48
 msgid "gencaches"
 msgstr "gencaches"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:75
+#: apt-cache.8.xml:49
 msgid ""
 "<literal>gencaches</literal> performs the same operation as <command>apt-get "
 "check</command>. It builds the source and package caches from the sources in "
@@ -808,12 +835,12 @@ msgstr ""
 "&sources-list; e a partir de <filename>/var/lib/dpkg/status</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:81
+#: apt-cache.8.xml:55
 msgid "showpkg <replaceable>pkg(s)</replaceable>"
 msgstr "showpkg <replaceable>pacote(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:82
+#: apt-cache.8.xml:56
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -837,7 +864,7 @@ msgstr ""
 "ao seguinte:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:94
+#: apt-cache.8.xml:68
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -863,7 +890,7 @@ msgstr ""
 "Fornecimentos Reversos: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:106
+#: apt-cache.8.xml:80
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -882,12 +909,12 @@ msgstr ""
 "consultar o código fonte do apt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:89
 msgid "stats"
 msgstr "stats"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:89
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
@@ -896,7 +923,7 @@ msgstr ""
 "são esperados mais argumentos. As estatísticas reportadas são:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:118
+#: apt-cache.8.xml:92
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
@@ -905,7 +932,7 @@ msgstr ""
 "encontrados na cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:122
+#: apt-cache.8.xml:96
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -918,7 +945,7 @@ msgstr ""
 "dependências. A maioria dos pacotes caem nesta categoria."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:128
+#: apt-cache.8.xml:102
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -935,7 +962,7 @@ msgstr ""
 "agent\", mas não existe um existe um pacote chamado \"mail-transport-agent\"."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:136
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -948,7 +975,7 @@ msgstr ""
 "apenas um pacote, xless, disponibiliza \"X11-text-viewer\"."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:142
+#: apt-cache.8.xml:116
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -961,7 +988,7 @@ msgstr ""
 "é tanto um pacote real, como também disponibilizado pelo pacote debconf-tiny."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:149
+#: apt-cache.8.xml:123
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -977,7 +1004,7 @@ msgstr ""
 "declarações de Conflitos ou Breaks."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:130
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache; this value is therefore at least equal to the number of "
@@ -992,7 +1019,7 @@ msgstr ""
 "consideravelmente maior que o número do total de nomes de pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:163
+#: apt-cache.8.xml:137
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
@@ -1001,12 +1028,12 @@ msgstr ""
 "dependências reivindicadas por todos os pacotes na cache."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:170
+#: apt-cache.8.xml:144
 msgid "showsrc <replaceable>pkg(s)</replaceable>"
 msgstr "showsrc <replaceable>pacote(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -1018,12 +1045,12 @@ msgstr ""
 "Binário."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:176 apt-config.8.xml:87
+#: apt-cache.8.xml:150 apt-config.8.xml:75
 msgid "dump"
 msgstr "dump"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:151
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
@@ -1032,12 +1059,12 @@ msgstr ""
 "cache. É principalmente para depuração."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:181
+#: apt-cache.8.xml:155
 msgid "dumpavail"
 msgstr "dumpavail"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:156
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
@@ -1047,12 +1074,12 @@ msgstr ""
 "&dselect;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:186
+#: apt-cache.8.xml:160
 msgid "unmet"
 msgstr "unmet"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:161
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
@@ -1061,12 +1088,12 @@ msgstr ""
 "insatisfeitas na cache do pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml:165
 msgid "show <replaceable>pkg(s)</replaceable>"
 msgstr "show <replaceable>pacote(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
@@ -1075,12 +1102,12 @@ msgstr ""
 "print-avail</command>; mostra os registos do pacote para os pacotes nomeados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:171
 msgid "search <replaceable>regex [ regex ... ]</replaceable>"
 msgstr "search <replaceable>regex [ regex ... ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:172
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see "
@@ -1105,7 +1132,7 @@ msgstr ""
 "longa, apenas no nome do pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:211
+#: apt-cache.8.xml:185
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
@@ -1114,12 +1141,12 @@ msgstr ""
 "busca os quais são lidados em conjunto."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:215
+#: apt-cache.8.xml:189
 msgid "depends <replaceable>pkg(s)</replaceable>"
 msgstr "depends <replaceable>pacote(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:216
+#: apt-cache.8.xml:190
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
@@ -1129,12 +1156,12 @@ msgstr ""
 "dependência."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:220
+#: apt-cache.8.xml:194
 msgid "rdepends <replaceable>pkg(s)</replaceable>"
 msgstr "rdepends <replaceable>pacote(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:195
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
@@ -1143,12 +1170,12 @@ msgstr ""
 "que um pacote tem."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:225
+#: apt-cache.8.xml:199
 msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
 msgstr "pkgnames <replaceable>[ prefixo ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml:200
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -1163,7 +1190,7 @@ msgstr ""
 "opção <option>--generate</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:205
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -1174,12 +1201,12 @@ msgstr ""
 "também são listados na lista gerada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:236
+#: apt-cache.8.xml:210
 msgid "dotty <replaceable>pkg(s)</replaceable>"
 msgstr "dotty <replaceable>pacote(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:237
+#: apt-cache.8.xml:211
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1200,7 +1227,7 @@ msgstr ""
 "defina a opção <literal>APT::Cache::GivenOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:246
+#: apt-cache.8.xml:220
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -1214,19 +1241,19 @@ msgstr ""
 "verdes são conflitos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:251
+#: apt-cache.8.xml:225
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 "Atenção, o dotty não consegue fazer gráficos com grandes conjuntos de "
 "pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
+#: apt-cache.8.xml:228
 msgid "xvcg <replaceable>pkg(s)</replaceable>"
 msgstr "xvcg <replaceable>pacote(s)</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:229
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -1236,12 +1263,12 @@ msgstr ""
 "VCG</ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:259
+#: apt-cache.8.xml:233
 msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
 msgstr "policy <replaceable>[ pacote(s) ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:260
+#: apt-cache.8.xml:234
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -1254,12 +1281,12 @@ msgstr ""
 "acerca da selecção de prioridade do pacote nomeado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:266
+#: apt-cache.8.xml:240
 msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
 msgstr "madison <replaceable>[ pacote(s) ]</replaceable>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:267
+#: apt-cache.8.xml:241
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -1278,24 +1305,24 @@ msgstr ""
 "Architecture</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126
-#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
+#: apt-cache.8.xml:252 apt-config.8.xml:84 apt-extracttemplates.1.xml:51
+#: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
+#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:577 apt.conf.5.xml:599
 msgid "options"
 msgstr "opções"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:256
 msgid "<option>-p</option>"
 msgstr "<option>-p</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:256
 msgid "<option>--pkg-cache</option>"
 msgstr "<option>--pkg-cache</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:283
+#: apt-cache.8.xml:257
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -1306,18 +1333,18 @@ msgstr ""
 "<literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404
-#: apt-sortpkgs.1.xml:61
+#: apt-cache.8.xml:262 apt-ftparchive.1.xml:551 apt-get.8.xml:321
+#: apt-sortpkgs.1.xml:52
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
+#: apt-cache.8.xml:262
 msgid "<option>--src-cache</option>"
 msgstr "<option>--src-cache</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:263
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1332,17 +1359,17 @@ msgstr ""
 "pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
+#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
+#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:271
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1356,17 +1383,17 @@ msgstr ""
 "Configuração: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:277
 msgid "<option>-i</option>"
 msgstr "<option>-i</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:277
 msgid "<option>--important</option>"
 msgstr "<option>--important</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:304
+#: apt-cache.8.xml:278
 msgid ""
 "Print only important dependencies; for use with unmet and depends. Causes "
 "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
@@ -1377,47 +1404,47 @@ msgstr ""
 "Configuração: <literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
+#: apt-cache.8.xml:283
 msgid "<option>--no-pre-depends</option>"
 msgstr "<option>--no-pre-depends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:284
 msgid "<option>--no-depends</option>"
 msgstr "<option>--no-depends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:285
 msgid "<option>--no-recommends</option>"
 msgstr "<option>--no-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:286
 msgid "<option>--no-suggests</option>"
 msgstr "<option>--no-suggests</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:287
 msgid "<option>--no-conflicts</option>"
 msgstr "<option>--no-conflicts</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:314
+#: apt-cache.8.xml:288
 msgid "<option>--no-breaks</option>"
 msgstr "<option>--no-breaks</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315
+#: apt-cache.8.xml:289
 msgid "<option>--no-replaces</option>"
 msgstr "<option>--no-replaces</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:290
 msgid "<option>--no-enhances</option>"
 msgstr "<option>--no-enhances</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:291
 #, fuzzy
 #| msgid ""
 #| "Per default the <literal>depends</literal> and <literal>rdepends</"
@@ -1439,17 +1466,17 @@ msgstr ""
 "ex. <literal>APT::Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
+#: apt-cache.8.xml:297 apt-cdrom.8.xml:111 apt-get.8.xml:278
 msgid "<option>-f</option>"
 msgstr "<option>-f</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323
+#: apt-cache.8.xml:297
 msgid "<option>--full</option>"
 msgstr "<option>--full</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:324
+#: apt-cache.8.xml:298
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
@@ -1458,18 +1485,18 @@ msgstr ""
 "<literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
-#: apt-get.8.xml:447
+#: apt-cache.8.xml:302 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563
+#: apt-get.8.xml:369
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:302
 msgid "<option>--all-versions</option>"
 msgstr "<option>--all-versions</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:303
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -1486,17 +1513,17 @@ msgstr ""
 "Configuração: <literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:311
 msgid "<option>-g</option>"
 msgstr "<option>-g</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:311
 msgid "<option>--generate</option>"
 msgstr "<option>--generate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:312
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1508,17 +1535,17 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:317
 msgid "<option>--names-only</option>"
 msgstr "<option>--names-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343 apt-cdrom.8.xml:142
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:129
 msgid "<option>-n</option>"
 msgstr "<option>-n</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:318
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1527,12 +1554,12 @@ msgstr ""
 "Configuração: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:348
+#: apt-cache.8.xml:322
 msgid "<option>--all-names</option>"
 msgstr "<option>--all-names</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:323
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -1543,12 +1570,12 @@ msgstr ""
 "<literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:354
+#: apt-cache.8.xml:328
 msgid "<option>--recurse</option>"
 msgstr "<option>--recurse</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:355
+#: apt-cache.8.xml:329
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1559,12 +1586,12 @@ msgstr ""
 "Configuração <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:360
+#: apt-cache.8.xml:334
 msgid "<option>--installed</option>"
 msgstr "<option>--installed</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:362
+#: apt-cache.8.xml:336
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -1575,46 +1602,46 @@ msgstr ""
 "<literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:591
-#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89
+#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513
+#: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:596 apt-key.8.xml:175 apt-mark.8.xml:144
+#: apt-cache.8.xml:346 apt-get.8.xml:518 apt-key.8.xml:167 apt-mark.8.xml:126
 #: apt.conf.5.xml:1110 apt_preferences.5.xml:697
 msgid "Files"
 msgstr "Ficheiros"
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:348
 msgid "&file-sourceslist; &file-statelists;"
 msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:606
-#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704
-#: sources.list.5.xml:250
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94
+#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528
+#: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704
+#: sources.list.5.xml:255
 msgid "See Also"
 msgstr "Veja também"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:380
+#: apt-cache.8.xml:354
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:612
-#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99
+#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534
+#: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr "Diagnóstico"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:385
+#: apt-cache.8.xml:359
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1641,23 +1668,8 @@ msgstr "apt-cdrom"
 msgid "APT CDROM management utility"
 msgstr "Utilitário de gestão de CDROM do APT"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cdrom.8.xml:38
-msgid ""
-"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
-"<arg>add</arg> <arg>ident</arg> </group>"
-msgstr ""
-"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>ponto de montagem do cdrom</replaceable></"
-"option></arg> <arg><option>-o=<replaceable>string de configuração</"
-"replaceable></option></arg> <arg><option>-c=<replaceable>ficheiro</"
-"replaceable></option></arg> <group> <arg>add</arg> <arg>ident</arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
+#: apt-cdrom.8.xml:38
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -1670,7 +1682,7 @@ msgstr ""
 "e verificar os ficheiros de índice."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:45
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
@@ -1682,12 +1694,12 @@ msgstr ""
 "conta possíveis falhas."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:68
+#: apt-cdrom.8.xml:55
 msgid "add"
 msgstr "add"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:69
+#: apt-cdrom.8.xml:56
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@ -1702,7 +1714,7 @@ msgstr ""
 "lhe-à pedido um título descritivo."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:77
+#: apt-cdrom.8.xml:64
 msgid ""
 "APT uses a CDROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -1713,12 +1725,12 @@ msgstr ""
 "list</filename>"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:84
+#: apt-cdrom.8.xml:71
 msgid "ident"
 msgstr "ident"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:85
+#: apt-cdrom.8.xml:72
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
@@ -1727,7 +1739,7 @@ msgstr ""
 "assim como o nome de ficheiro armazenado"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:64
+#: apt-cdrom.8.xml:51
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present.  <placeholder type=\"variablelist"
@@ -1738,22 +1750,22 @@ msgstr ""
 "\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:161
+#: apt-cdrom.8.xml:81 apt-key.8.xml:153
 msgid "Options"
 msgstr "Opções"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
+#: apt-cdrom.8.xml:85 apt-ftparchive.1.xml:519 apt-get.8.xml:273
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98
+#: apt-cdrom.8.xml:85
 msgid "<option>--cdrom</option>"
 msgstr "<option>--cdrom</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:99
+#: apt-cdrom.8.xml:86
 msgid ""
 "Mount point; specify the location to mount the cdrom. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -1765,17 +1777,17 @@ msgstr ""
 "mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
+#: apt-cdrom.8.xml:94
 msgid "<option>-r</option>"
 msgstr "<option>-r</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
+#: apt-cdrom.8.xml:94
 msgid "<option>--rename</option>"
 msgstr "<option>--rename</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:108
+#: apt-cdrom.8.xml:95
 msgid ""
 "Rename a disc; change the label of a disk or override the disks given label. "
 "This option will cause <command>apt-cdrom</command> to prompt for a new "
@@ -1787,17 +1799,17 @@ msgstr ""
 "CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116 apt-get.8.xml:375
+#: apt-cdrom.8.xml:103 apt-get.8.xml:292
 msgid "<option>-m</option>"
 msgstr "<option>-m</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116
+#: apt-cdrom.8.xml:103
 msgid "<option>--no-mount</option>"
 msgstr "<option>--no-mount</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:117
+#: apt-cdrom.8.xml:104
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -1808,12 +1820,12 @@ msgstr ""
 "NoMount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:124
+#: apt-cdrom.8.xml:111
 msgid "<option>--fast</option>"
 msgstr "<option>--fast</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:125
+#: apt-cdrom.8.xml:112
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1826,12 +1838,12 @@ msgstr ""
 "configuração: <literal>APT::CDROM::Fast</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:134
+#: apt-cdrom.8.xml:121
 msgid "<option>--thorough</option>"
 msgstr "<option>--thorough</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:135
+#: apt-cdrom.8.xml:122
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1842,22 +1854,22 @@ msgstr ""
 "estranhos. Demora muito mais tempo a sondar o CD mas irá apanhá-los a todos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:143 apt-get.8.xml:406
+#: apt-cdrom.8.xml:130 apt-get.8.xml:323
 msgid "<option>--just-print</option>"
 msgstr "<option>--just-print</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:144 apt-get.8.xml:408
+#: apt-cdrom.8.xml:131 apt-get.8.xml:325
 msgid "<option>--recon</option>"
 msgstr "<option>--recon</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:145 apt-get.8.xml:409
+#: apt-cdrom.8.xml:132 apt-get.8.xml:326
 msgid "<option>--no-act</option>"
 msgstr "<option>--no-act</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:133
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -1868,12 +1880,12 @@ msgstr ""
 "configuração: <literal>APT::CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:159
+#: apt-cdrom.8.xml:146
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-conf;, &apt-get;, &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:164
+#: apt-cdrom.8.xml:151
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1902,21 +1914,8 @@ msgstr "apt-config"
 msgid "APT Configuration Query program"
 msgstr "Programa de Consulta de Configuração do APT"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-config.8.xml:39
-msgid ""
-"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>shell</arg> <arg>dump</arg> </group>"
-msgstr ""
-"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
-"o=<replaceable>string de configuração</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>ficheiro</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:51
+#: apt-config.8.xml:39
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -1929,7 +1928,7 @@ msgstr ""
 "um modo que é fácil de usar para aplicações em script."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:56 apt-ftparchive.1.xml:75
+#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present."
@@ -1938,12 +1937,12 @@ msgstr ""
 "fornecida, um dos comandos abaixo têm que estar presentes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:49
 msgid "shell"
 msgstr "shell"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:63
+#: apt-config.8.xml:51
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
@@ -1958,7 +1957,7 @@ msgstr ""
 "script shell deverá ser usado como:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:71
+#: apt-config.8.xml:59
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -1970,7 +1969,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:76
+#: apt-config.8.xml:64
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
@@ -1979,7 +1978,7 @@ msgstr ""
 "options com uma predefinição de <option>-f</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:80
+#: apt-config.8.xml:68
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -1991,18 +1990,18 @@ msgstr ""
 "verificado internamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:89
+#: apt-config.8.xml:77
 msgid "Just show the contents of the configuration space."
 msgstr "Apenas mostra o conteúdo do espaço de configuração."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
-#: apt-sortpkgs.1.xml:73
+#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112
+#: apt-config.8.xml:100
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -2027,21 +2026,8 @@ msgstr ""
 "Utilitário para extrair configurações e modelos DebConf a partir de pacotes "
 "Debian"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-extracttemplates.1.xml:39
-msgid ""
-"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-"<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
-"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
-"arg>"
-msgstr ""
-"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-"<arg><option>-t=<replaceable>directório temporário</replaceable></option></"
-"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>ficheiro</"
-"replaceable></arg>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:39
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -2056,12 +2042,12 @@ msgstr ""
 "gerada uma linha no formato:"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:52
+#: apt-extracttemplates.1.xml:44
 msgid "package version template-file config-script"
 msgstr "pacote versão ficheiro-modelo script-de-configuração"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:53
+#: apt-extracttemplates.1.xml:45
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
@@ -2075,17 +2061,17 @@ msgstr ""
 "configuração.XXXX</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63 apt-get.8.xml:525
+#: apt-extracttemplates.1.xml:55 apt-get.8.xml:447
 msgid "<option>-t</option>"
 msgstr "<option>-t</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63
+#: apt-extracttemplates.1.xml:55
 msgid "<option>--tempdir</option>"
 msgstr "<option>--tempdir</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:65
+#: apt-extracttemplates.1.xml:57
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@ -2096,7 +2082,7 @@ msgstr ""
 "ExtractTemplates::TempDir</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:82
+#: apt-extracttemplates.1.xml:74
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -2124,51 +2110,8 @@ msgstr "apt-ftparchive"
 msgid "Utility to generate index files"
 msgstr "Utilitário para gerar ficheiros de índice"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-ftparchive.1.xml:39
-msgid ""
-"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
-"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
-"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
-"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-"replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
-"arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
-"arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
-"replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
-"\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
-msgstr ""
-"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-"arg> <arg><option>--arch <replaceable>arquitectura</replaceable></option></"
-"arg> <arg><option>-o <replaceable>configuração</"
-"replaceable>=<replaceable>string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>ficheiro</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>packages<arg choice=\"plain\" rep=\"repeat\"><replaceable>caminho</"
-"replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>prefixo-de-caminho</replaceable></arg></arg></"
-"arg> <arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>caminho</"
-"replaceable></arg><arg><replaceable>sobrepor</"
-"replaceable><arg><replaceable>prefixo-de-caminho</replaceable></arg></arg></"
-"arg> <arg>contents <arg choice=\"plain\"><replaceable>caminho</replaceable></"
-"arg></arg> <arg>release <arg choice=\"plain\"><replaceable>caminho</"
-"replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-"\"><replaceable>ficheiro-de-configuração</replaceable></arg> <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>secção</replaceable></arg></arg> "
-"<arg>clean <arg choice=\"plain\"><replaceable>ficheiro-de-configuração</"
-"replaceable></arg></arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -2181,7 +2124,7 @@ msgstr ""
 "baseados no conteúdo desse site."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:64
+#: apt-ftparchive.1.xml:43
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -2196,7 +2139,7 @@ msgstr ""
 "script o processo de geração para um arquivo completo."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:70
+#: apt-ftparchive.1.xml:49
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -2211,12 +2154,12 @@ msgstr ""
 "ficheiros e constrói os ficheiros comprimidos desejados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:79
+#: apt-ftparchive.1.xml:58
 msgid "packages"
 msgstr "packages"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:81
+#: apt-ftparchive.1.xml:60
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -2229,7 +2172,7 @@ msgstr ""
 "Este comando é aproximadamente equivalente ao &dpkg-scanpackages;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
+#: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
@@ -2237,12 +2180,12 @@ msgstr ""
 "dados de cache binária."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:89
+#: apt-ftparchive.1.xml:68
 msgid "sources"
 msgstr "sources"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:70
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -2255,7 +2198,7 @@ msgstr ""
 "Este comando é aproximadamente equivalente ao &dpkg-scansources;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:75
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -2267,12 +2210,12 @@ msgstr ""
 "fonte que irá ser usado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:101
+#: apt-ftparchive.1.xml:80
 msgid "contents"
 msgstr "contents"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:103
+#: apt-ftparchive.1.xml:82
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -2290,12 +2233,12 @@ msgstr ""
 "por uma vírgula na saída."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:113
+#: apt-ftparchive.1.xml:92
 msgid "release"
 msgstr "release"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:115
+#: apt-ftparchive.1.xml:94
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -2310,7 +2253,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:125
+#: apt-ftparchive.1.xml:104
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -2331,12 +2274,12 @@ msgstr ""
 "<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:115
 msgid "generate"
 msgstr "generate"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:138
+#: apt-ftparchive.1.xml:117
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -2352,12 +2295,12 @@ msgstr ""
 "definições requeridas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
+#: apt-ftparchive.1.xml:124 apt-get.8.xml:215
 msgid "clean"
 msgstr "clean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:126
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
@@ -2367,12 +2310,12 @@ msgstr ""
 "são necessários."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:153
+#: apt-ftparchive.1.xml:132
 msgid "The Generate Configuration"
 msgstr "A Configuração do Generate"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:134
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -2389,7 +2332,7 @@ msgstr ""
 "árvore. Isto apenas afecta o modo de como a etiqueta scope é manuseada."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:163
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
@@ -2397,12 +2340,12 @@ msgstr ""
 "abaixo."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:144
 msgid "Dir Section"
 msgstr "Secção Dir"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:146
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -2415,12 +2358,12 @@ msgstr ""
 "posteriores para produzir um caminho completo e absoluto."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:151
 msgid "ArchiveDir"
 msgstr "ArchiveDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:153
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2430,32 +2373,32 @@ msgstr ""
 "directório que contém o <filename>ls-LR</filename> e nós da distribuição."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:179
+#: apt-ftparchive.1.xml:158
 msgid "OverrideDir"
 msgstr "OverrideDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:160
 msgid "Specifies the location of the override files."
 msgstr "Especifica a localização dos ficheiros de sobrepor."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:184
+#: apt-ftparchive.1.xml:163
 msgid "CacheDir"
 msgstr "CacheDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:165
 msgid "Specifies the location of the cache files"
 msgstr "Especifica a localização dos ficheiros de cache"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:189
+#: apt-ftparchive.1.xml:168
 msgid "FileListDir"
 msgstr "FileListDir"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:170
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
@@ -2464,12 +2407,12 @@ msgstr ""
 "definição <literal>FileList</literal> for usada mais abaixo."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:176
 msgid "Default Section"
 msgstr "Secção Default"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:199
+#: apt-ftparchive.1.xml:178
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -2480,12 +2423,12 @@ msgstr ""
 "sobrepor estas predefinições em uma definição por-secção."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
+#: apt-ftparchive.1.xml:182
 msgid "Packages::Compress"
 msgstr "Packages::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:184
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -2498,12 +2441,12 @@ msgstr ""
 "predefinição para todos os esquemas de compressão é '. gzip'."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:190
 msgid "Packages::Extensions"
 msgstr "Packages::Extensions"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:213
+#: apt-ftparchive.1.xml:192
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
@@ -2512,12 +2455,12 @@ msgstr ""
 "pacote. A predefinição é '.deb'."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:196
 msgid "Sources::Compress"
 msgstr "Sources::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:219
+#: apt-ftparchive.1.xml:198
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
@@ -2526,12 +2469,12 @@ msgstr ""
 "controla a compressão para os ficheiros das Fontes."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:202
 msgid "Sources::Extensions"
 msgstr "Sources::Extensions"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:225
+#: apt-ftparchive.1.xml:204
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
@@ -2540,12 +2483,12 @@ msgstr ""
 "fontes. A predefinição é '.dsc'."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:208
 msgid "Contents::Compress"
 msgstr "Contents::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:210
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
@@ -2554,12 +2497,12 @@ msgstr ""
 "controla a compressão para os ficheiros de Conteúdos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:214
 msgid "Translation::Compress"
 msgstr "Translation::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:237
+#: apt-ftparchive.1.xml:216
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
@@ -2568,12 +2511,12 @@ msgstr ""
 "controla a compressão para o ficheiro mestre Translation-en."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
+#: apt-ftparchive.1.xml:220
 msgid "DeLinkLimit"
 msgstr "DeLinkLimit"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:222
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -2584,12 +2527,12 @@ msgstr ""
 "Links</literal> por secção."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248
+#: apt-ftparchive.1.xml:227
 msgid "FileMode"
 msgstr "FileMode"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:229
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
@@ -2599,12 +2542,12 @@ msgstr ""
 "independentemente do umask."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
+#: apt-ftparchive.1.xml:234 apt-ftparchive.1.xml:380
 msgid "LongDescription"
 msgstr "LongDescription"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+#: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
@@ -2613,12 +2556,12 @@ msgstr ""
 "divididas em um ficheiro Translation-en mestre."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:263
+#: apt-ftparchive.1.xml:242
 msgid "TreeDefault Section"
 msgstr "Secção TreeDefault"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml:244
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -2629,12 +2572,12 @@ msgstr ""
 "$(DIST), $(SECTION) e $(ARCH) substituídas pelos seus respectivos valores."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:249
 msgid "MaxContentsChange"
 msgstr "MaxContentsChange"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:272
+#: apt-ftparchive.1.xml:251
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -2645,12 +2588,12 @@ msgstr ""
 "alguns dias todos sejam reconstruídos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:256
 msgid "ContentsAge"
 msgstr "ContentsAge"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:279
+#: apt-ftparchive.1.xml:258
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -2668,12 +2611,12 @@ msgstr ""
 "modo. A predefinição é 10, as unidades são em dias."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:267
 msgid "Directory"
 msgstr "Directory"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:290
+#: apt-ftparchive.1.xml:269
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
@@ -2682,12 +2625,12 @@ msgstr ""
 "$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:273
 msgid "SrcDirectory"
 msgstr "SrcDirectory"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:296
+#: apt-ftparchive.1.xml:275
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
@@ -2696,12 +2639,12 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/source/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:418
 msgid "Packages"
 msgstr "Packages"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:281
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
@@ -2710,12 +2653,12 @@ msgstr ""
 "$(SECTION)/binary-$(ARCH)/Packages</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:306 apt-ftparchive.1.xml:444
+#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:423
 msgid "Sources"
 msgstr "Sources"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:287
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
@@ -2724,12 +2667,12 @@ msgstr ""
 "$(SECTION)/source/Sources</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
+#: apt-ftparchive.1.xml:291
 msgid "Translation"
 msgstr "Translation"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:293
 msgid ""
 "Set the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
@@ -2740,12 +2683,12 @@ msgstr ""
 "$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319
+#: apt-ftparchive.1.xml:298
 msgid "InternalPrefix"
 msgstr "InternalPrefix"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:300
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -2756,12 +2699,12 @@ msgstr ""
 "$(SECTION)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:305 apt-ftparchive.1.xml:429
 msgid "Contents"
 msgstr "Contents"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:307
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
@@ -2775,22 +2718,22 @@ msgstr ""
 "ficheiros pacotes todos juntos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:314
 msgid "Contents::Header"
 msgstr "Contents::Header"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:316
 msgid "Sets header file to prepend to the contents output."
 msgstr "Define o ficheiro cabeçalho para prefixar a saída de conteúdos."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:340 apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:454
 msgid "BinCacheDB"
 msgstr "BinCacheDB"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:342
+#: apt-ftparchive.1.xml:321
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
@@ -2799,12 +2742,12 @@ msgstr ""
 "secções podem partilhar a mesma base de dados."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:325
 msgid "FileList"
 msgstr "FileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:327
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -2816,12 +2759,12 @@ msgstr ""
 "arquivo."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:353
+#: apt-ftparchive.1.xml:332
 msgid "SourceFileList"
 msgstr "SourceFileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:355
+#: apt-ftparchive.1.xml:334
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -2834,12 +2777,12 @@ msgstr ""
 "arquivo. Isto é usado quando se processa índices de fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:342
 msgid "Tree Section"
 msgstr "Secção Tree"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:365
+#: apt-ftparchive.1.xml:344
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -2854,7 +2797,7 @@ msgstr ""
 "<literal>Directory</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:349
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -2867,7 +2810,7 @@ msgstr ""
 "definição tal como <filename>dists/&stable-codename;</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:375
+#: apt-ftparchive.1.xml:354
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
@@ -2878,7 +2821,7 @@ msgstr ""
 "variáveis."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:381
+#: apt-ftparchive.1.xml:360
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -2892,7 +2835,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:378
+#: apt-ftparchive.1.xml:357
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -2903,12 +2846,12 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
+#: apt-ftparchive.1.xml:366
 msgid "Sections"
 msgstr "Sections"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389
+#: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"
@@ -2919,12 +2862,12 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
+#: apt-ftparchive.1.xml:373 apt.conf.5.xml:157
 msgid "Architectures"
 msgstr "Architectures"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:375
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -2935,12 +2878,12 @@ msgstr ""
 "indicar que esta árvore tem um arquivo fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:434
 msgid "BinOverride"
 msgstr "BinOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:388
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
@@ -2949,12 +2892,12 @@ msgstr ""
 "informação de secção, prioridade e endereço do responsável."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:439
 msgid "SrcOverride"
 msgstr "SrcOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:415
+#: apt-ftparchive.1.xml:394
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
@@ -2963,32 +2906,32 @@ msgstr ""
 "informação de secção."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
+#: apt-ftparchive.1.xml:398 apt-ftparchive.1.xml:444
 msgid "ExtraOverride"
 msgstr "ExtraOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
 msgid "Sets the binary extra override file."
 msgstr "Define o ficheiro de sobreposição extra binário."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:424 apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:403 apt-ftparchive.1.xml:449
 msgid "SrcExtraOverride"
 msgstr "SrcExtraOverride"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
+#: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
 msgid "Sets the source extra override file."
 msgstr "Define o ficheiro de sobreposição extra fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:431
+#: apt-ftparchive.1.xml:410
 msgid "BinDirectory Section"
 msgstr "Secção BinDirectory"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:412
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -3003,12 +2946,12 @@ msgstr ""
 "definições <literal>Section</literal><literal>Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:441
+#: apt-ftparchive.1.xml:420
 msgid "Sets the Packages file output."
 msgstr "Define a saída do ficheiro Packages."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:446
+#: apt-ftparchive.1.xml:425
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
@@ -3017,52 +2960,52 @@ msgstr ""
 "<literal>Packages</literal> ou <literal>Sources</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml:431
 msgid "Sets the Contents file output. (optional)"
 msgstr "Define a saída do ficheiro Contents (opcional)"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:457
+#: apt-ftparchive.1.xml:436
 msgid "Sets the binary override file."
 msgstr "Define o ficheiro de sobreposição binário."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:441
 msgid "Sets the source override file."
 msgstr "Define o ficheiro de sobreposição fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:477
+#: apt-ftparchive.1.xml:456
 msgid "Sets the cache DB."
 msgstr "Define a base de dados de cache."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:459
 msgid "PathPrefix"
 msgstr "PathPrefix"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:461
 msgid "Appends a path to all the output paths."
 msgstr "Acrescenta um caminho a todos os caminhos de saída."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:464
 msgid "FileList, SourceFileList"
 msgstr "FileList, SourceFileList"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:466
 msgid "Specifies the file list file."
 msgstr "Especifica o ficheiro de lista de ficheiros."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:473
 msgid "The Binary Override File"
 msgstr "O Ficheiro Binary Override"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:495
+#: apt-ftparchive.1.xml:474
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -3077,19 +3020,19 @@ msgstr ""
 "permutação do responsável."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:480
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr "old [// oldn]* => new"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:482
 #, no-wrap
 msgid "new"
 msgstr "new"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:500
+#: apt-ftparchive.1.xml:479
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3106,12 +3049,12 @@ msgstr ""
 "formato substitui incondicionalmente o campo do responsável."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:490
 msgid "The Source Override File"
 msgstr "O Ficheiro Source Override"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:513
+#: apt-ftparchive.1.xml:492
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -3122,12 +3065,12 @@ msgstr ""
 "nome de pacote fonte, o segundo é a secção onde o atribuir."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:497
 msgid "The Extra Override File"
 msgstr "O Ficheiro Extra Override"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:520
+#: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -3138,13 +3081,23 @@ msgstr ""
 "pacote, a segunda é a etiqueta e restante da linha é o novo valor."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:508
 msgid ""
 "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml:510
+#, fuzzy
+#| msgid ""
+#| "Values for the additional metadata fields in the Release file are taken "
+#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
+#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
+#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
+#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
+#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-"
+#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</"
+#| "literal>, <literal>Description</literal>."
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -3156,14 +3109,22 @@ msgid ""
 "literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
 "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
 msgstr ""
+"Valores para os campos de metadados adicionais no ficheiro Release são "
+"tomados a partir das variáveis correspondentes sob <literal>APT::FTPArchive::"
+"Release</literal>, ex. <literal>APT::FTPArchive::Release::Origin</literal>.  "
+"Os campos suportados são: <literal>Origin</literal>, <literal>Label</"
+"literal>, <literal>Suite</literal>, <literal>Version</literal>, "
+"<literal>Codename</literal>, <literal>Date</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:540
+#: apt-ftparchive.1.xml:519
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:521
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3172,7 +3133,7 @@ msgstr ""
 "generate. Item de configuração: <literal>APT::FTPArchive::DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:548
+#: apt-ftparchive.1.xml:527
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3186,12 +3147,12 @@ msgstr ""
 "<literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:554
+#: apt-ftparchive.1.xml:533
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:556
+#: apt-ftparchive.1.xml:535
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3204,12 +3165,12 @@ msgstr ""
 "option>. Item de Configuração: <literal>APT::FTPArchive::DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:562
+#: apt-ftparchive.1.xml:541
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:564
+#: apt-ftparchive.1.xml:543
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3225,12 +3186,12 @@ msgstr ""
 "de Configuração: <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:572
+#: apt-ftparchive.1.xml:551
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:553
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3241,12 +3202,12 @@ msgstr ""
 "SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:578
+#: apt-ftparchive.1.xml:557
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:559
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3255,12 +3216,12 @@ msgstr ""
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:584
+#: apt-ftparchive.1.xml:563
 msgid "<option>--arch</option>"
 msgstr "<option>--arch</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:585
+#: apt-ftparchive.1.xml:564
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3274,12 +3235,12 @@ msgstr ""
 "FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:591
+#: apt-ftparchive.1.xml:570
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:593
+#: apt-ftparchive.1.xml:572
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3303,12 +3264,12 @@ msgstr ""
 "as verificações extras serão desnecessárias."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:603
+#: apt-ftparchive.1.xml:582
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:605
+#: apt-ftparchive.1.xml:584
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3323,19 +3284,19 @@ msgstr ""
 "<filename>Translation-en</filename> só pode ser criado no comando generate."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544
-#: sources.list.5.xml:209
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1104 apt_preferences.5.xml:544
+#: sources.list.5.xml:214
 msgid "Examples"
 msgstr "Examples"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:623
+#: apt-ftparchive.1.xml:602
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> pacotes <replaceable>directório</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:619
+#: apt-ftparchive.1.xml:598
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3344,7 +3305,7 @@ msgstr ""
 "pacotes binários (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:633
+#: apt-ftparchive.1.xml:612
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3374,96 +3335,8 @@ msgstr ""
 "Utilitário de manuseamento de pacotes do APT -- interface de linha de "
 "comandos"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-get.8.xml:39
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
-#| "<arg> <option>-t=</option> <arg choice='plain'> "
-#| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
-#| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
-#| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
-#| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
-#| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-#| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-#| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
-#| "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#| "<group choice='req'> <arg choice='plain'> "
-#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-#| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-#| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#| "help</arg> </group> </arg> </group>"
-msgid ""
-"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
-"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
-"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
-"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> "
-"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice="
-"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
-"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
-"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
-"arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
-"<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-"<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
-"</group> </arg> </group>"
-msgstr ""
-"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>string_de_configuração</replaceable> </option> </"
-"arg> <arg> <option>-c= <replaceable>ficheiro_de_configuração</replaceable> </"
-"option> </arg> <arg> <option>-t=</option> <arg choice='plain'> "
-"<replaceable>lançamento_de_destino</replaceable> </arg> </arg> <group choice="
-"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
-"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
-"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-"choice='plain'> =<replaceable>número_de_versão_do_pacote</replaceable> </"
-"arg> <arg choice='plain'> /<replaceable>lançamento_de_destino</replaceable> "
-"</arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pacote</replaceable></arg></arg> <arg choice='plain'>source "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable> <arg> "
-"<group choice='req'> <arg choice='plain'> "
-"=<replaceable>número_de_versão_do_pacote</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>lançamento_de_destino</replaceable> </arg> </"
-"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pacote</replaceable></arg></arg> <arg "
-"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
-"</group> </arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:122
+#: apt-get.8.xml:39
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
@@ -3476,12 +3349,12 @@ msgstr ""
 "\"front-end\" como o &dselect;, &aptitude;, &synaptic; e &wajig;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:131 apt-key.8.xml:127
+#: apt-get.8.xml:48 apt-key.8.xml:119
 msgid "update"
 msgstr "update"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:132
+#: apt-get.8.xml:49
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -3505,12 +3378,12 @@ msgstr ""
 "ficheiros de pacotes não pode ser conhecido com antecedência."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:143 guide.sgml:121
+#: apt-get.8.xml:60 guide.sgml:121
 msgid "upgrade"
 msgstr "upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:144
+#: apt-get.8.xml:61
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -3536,12 +3409,12 @@ msgstr ""
 "novas versões de pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:156
+#: apt-get.8.xml:73
 msgid "dselect-upgrade"
 msgstr "dselect-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:157
+#: apt-get.8.xml:74
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -3557,12 +3430,12 @@ msgstr ""
 "estado (por exemplo, a remoção de pacotes antigos e a instalação de novos)."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:166 guide.sgml:140
+#: apt-get.8.xml:83 guide.sgml:140
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:167
+#: apt-get.8.xml:84
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3586,12 +3459,12 @@ msgstr ""
 "sobrepor as definições gerais em pacotes individuais."
 
 #. type: <tag></tag>
-#: apt-get.8.xml:179 guide.sgml:131
+#: apt-get.8.xml:96 guide.sgml:131
 msgid "install"
 msgstr "install"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:181
+#: apt-get.8.xml:98
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -3619,7 +3492,7 @@ msgstr ""
 "decisões feitas pelo sistema de resolução de conflitos do apt-get."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:116
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -3636,7 +3509,7 @@ msgstr ""
 "versão da distribuição ou o nome de Arquivo (stable, testing, unstable)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:123
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
@@ -3645,7 +3518,7 @@ msgstr ""
 "e devem ser usados com cuidado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:209
+#: apt-get.8.xml:126
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -3665,7 +3538,7 @@ msgstr ""
 "descarregadas e instaladas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:220
+#: apt-get.8.xml:137
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
@@ -3674,7 +3547,7 @@ msgstr ""
 "instalação alternativa para pacotes individuais."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:141
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -3693,12 +3566,12 @@ msgstr ""
 "caractere '^' ou '$', para criar uma expressão regular mais específica."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:233
+#: apt-get.8.xml:150
 msgid "remove"
 msgstr "remove"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:151
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -3713,12 +3586,12 @@ msgstr ""
 "pacote identificado será instalado em vez de removido."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:241
+#: apt-get.8.xml:158
 msgid "purge"
 msgstr "purge"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:242
+#: apt-get.8.xml:159
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -3729,12 +3602,12 @@ msgstr ""
 "configuração são também apagados)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:163
 msgid "source"
 msgstr "source"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:247
+#: apt-get.8.xml:164
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -3753,7 +3626,7 @@ msgstr ""
 "<literal>pkg/release</literal>, se possível."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:255
+#: apt-get.8.xml:172
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> type lines in the &sources-list; file. This means that you "
@@ -3769,7 +3642,7 @@ msgstr ""
 "instalada ou pode instalar."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:179
 #, fuzzy
 #| msgid ""
 #| "If the <option>--compile</option> option is specified then the package "
@@ -3789,7 +3662,7 @@ msgstr ""
 "pacote fonte não será desempacotado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:186
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -3804,7 +3677,7 @@ msgstr ""
 "Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:275
+#: apt-get.8.xml:192
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -3815,12 +3688,12 @@ msgstr ""
 "balls fonte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:280
+#: apt-get.8.xml:197
 msgid "build-dep"
 msgstr "build-dep"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:281
+#: apt-get.8.xml:198
 #, fuzzy
 #| msgid ""
 #| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
@@ -3836,12 +3709,12 @@ msgstr ""
 "tentativa de satisfazer dependências de compilação para um pacote fonte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
+#: apt-get.8.xml:204
 msgid "check"
 msgstr "check"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:205
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
@@ -3850,19 +3723,19 @@ msgstr ""
 "de pacotes e verifica por dependências quebradas."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:209
 msgid "download"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:210
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:299
+#: apt-get.8.xml:216
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -3881,12 +3754,12 @@ msgstr ""
 "libertar espaço do disco."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:225
 msgid "autoclean"
 msgstr "autoclean"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:309
+#: apt-get.8.xml:226
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -3905,12 +3778,12 @@ msgstr ""
 "pacotes instalados sejam apagados se estiver definida para 'off'."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:318
+#: apt-get.8.xml:235
 msgid "autoremove"
 msgstr "autoremove"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
+#: apt-get.8.xml:236
 #, fuzzy
 #| msgid ""
 #| "<literal>autoremove</literal> is used to remove packages that were "
@@ -3926,12 +3799,12 @@ msgstr ""
 "que já não são necessários."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323
+#: apt-get.8.xml:240
 msgid "changelog"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:241
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -3944,12 +3817,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:346
+#: apt-get.8.xml:263
 msgid "<option>--no-install-recommends</option>"
 msgstr "<option>--no-install-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:264
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -3958,14 +3831,14 @@ msgstr ""
 "de Configuração: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:351
+#: apt-get.8.xml:268
 #, fuzzy
 #| msgid "<option>--no-suggests</option>"
 msgid "<option>--install-suggests</option>"
 msgstr "<option>--no-suggests</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml:269
 #, fuzzy
 #| msgid ""
 #| "Do not consider recommended packages as a dependency for installing.  "
@@ -3978,12 +3851,12 @@ msgstr ""
 "de Configuração: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:356
+#: apt-get.8.xml:273
 msgid "<option>--download-only</option>"
 msgstr "<option>--download-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:357
+#: apt-get.8.xml:274
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -3993,12 +3866,12 @@ msgstr ""
 "Download-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:361
+#: apt-get.8.xml:278
 msgid "<option>--fix-broken</option>"
 msgstr "<option>--fix-broken</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:362
+#: apt-get.8.xml:279
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
@@ -4026,17 +3899,17 @@ msgstr ""
 "<literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:375
+#: apt-get.8.xml:292
 msgid "<option>--ignore-missing</option>"
 msgstr "<option>--ignore-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:376
+#: apt-get.8.xml:293
 msgid "<option>--fix-missing</option>"
 msgstr "<option>--fix-missing</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:294
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -4055,12 +3928,12 @@ msgstr ""
 "de Configuração: <literal>APT::Get::Fix-Missing</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:387
+#: apt-get.8.xml:304
 msgid "<option>--no-download</option>"
 msgstr "<option>--no-download</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:388
+#: apt-get.8.xml:305
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -4071,7 +3944,7 @@ msgstr ""
 "descarregados. Item de Configuração: <literal>APT::Get::Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:395
+#: apt-get.8.xml:312
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -4091,17 +3964,17 @@ msgstr ""
 "<literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:405
+#: apt-get.8.xml:322
 msgid "<option>--simulate</option>"
 msgstr "<option>--simulate</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:407
+#: apt-get.8.xml:324
 msgid "<option>--dry-run</option>"
 msgstr "<option>--dry-run</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:410
+#: apt-get.8.xml:327
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -4112,7 +3985,7 @@ msgstr ""
 "Simulate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:331
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "
@@ -4130,7 +4003,7 @@ msgstr ""
 "get</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:337
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4143,22 +4016,22 @@ msgstr ""
 "vazios significam quebras que não têm consequência (raro)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:344
 msgid "<option>-y</option>"
 msgstr "<option>-y</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:344
 msgid "<option>--yes</option>"
 msgstr "<option>--yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:428
+#: apt-get.8.xml:345
 msgid "<option>--assume-yes</option>"
 msgstr "<option>--assume-yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:429
+#: apt-get.8.xml:346
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -4174,17 +4047,37 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:353
+#, fuzzy
+#| msgid "<option>--assume-yes</option>"
+msgid "<option>--assume-no</option>"
+msgstr "<option>--assume-yes</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:354
+#, fuzzy
+#| msgid ""
+#| "Compile source packages after downloading them.  Configuration Item: "
+#| "<literal>APT::Get::Compile</literal>."
+msgid ""
+"Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
+"Assume-No</literal>."
+msgstr ""
+"Compila pacotes fonte após os descarregar. Item de Configuração: "
+"<literal>APT::Get::Compile</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:358
 msgid "<option>-u</option>"
 msgstr "<option>-u</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:358
 msgid "<option>--show-upgraded</option>"
 msgstr "<option>--show-upgraded</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:437
+#: apt-get.8.xml:359
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4194,17 +4087,17 @@ msgstr ""
 "Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:364
 msgid "<option>-V</option>"
 msgstr "<option>-V</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:364
 msgid "<option>--verbose-versions</option>"
 msgstr "<option>--verbose-versions</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:365
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
@@ -4213,14 +4106,14 @@ msgstr ""
 "Configuração: <literal>APT::Get::Show-Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:370
 #, fuzzy
 #| msgid "<option>--recurse</option>"
 msgid "<option>--host-architecture</option>"
 msgstr "<option>--recurse</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:371
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
@@ -4231,22 +4124,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:379
 msgid "<option>-b</option>"
 msgstr "<option>-b</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:379
 msgid "<option>--compile</option>"
 msgstr "<option>--compile</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:458
+#: apt-get.8.xml:380
 msgid "<option>--build</option>"
 msgstr "<option>--build</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:459
+#: apt-get.8.xml:381
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
@@ -4255,12 +4148,12 @@ msgstr ""
 "<literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:385
 msgid "<option>--ignore-hold</option>"
 msgstr "<option>--ignore-hold</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:464
+#: apt-get.8.xml:386
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -4273,12 +4166,12 @@ msgstr ""
 "Item de Configuração: <literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:470
+#: apt-get.8.xml:392
 msgid "<option>--no-upgrade</option>"
 msgstr "<option>--no-upgrade</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:393
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4291,12 +4184,12 @@ msgstr ""
 "Configuração: <literal>APT::Get::Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:477
+#: apt-get.8.xml:399
 msgid "<option>--only-upgrade</option>"
 msgstr "<option>--only-upgrade</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:478
+#: apt-get.8.xml:400
 msgid ""
 "Do not install new packages; When used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will prevent packages on the "
@@ -4309,12 +4202,12 @@ msgstr ""
 "de Configuração: <literal>APT::Get::Only-Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:484
+#: apt-get.8.xml:406
 msgid "<option>--force-yes</option>"
 msgstr "<option>--force-yes</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:485
+#: apt-get.8.xml:407
 msgid ""
 "Force yes; This is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -4329,12 +4222,12 @@ msgstr ""
 "<literal>APT::Get::force-yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:492
+#: apt-get.8.xml:414
 msgid "<option>--print-uris</option>"
 msgstr "<option>--print-uris</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:493
+#: apt-get.8.xml:415
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected md5 "
@@ -4355,12 +4248,12 @@ msgstr ""
 "Configuração: <literal>APT::Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:503
+#: apt-get.8.xml:425
 msgid "<option>--purge</option>"
 msgstr "<option>--purge</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:504
+#: apt-get.8.xml:426
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -4373,12 +4266,12 @@ msgstr ""
 "option>. Item de Configuração: <literal>APT::Get::Purge</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
+#: apt-get.8.xml:433
 msgid "<option>--reinstall</option>"
 msgstr "<option>--reinstall</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:434
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4387,12 +4280,12 @@ msgstr ""
 "Configuração: <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:516
+#: apt-get.8.xml:438
 msgid "<option>--list-cleanup</option>"
 msgstr "<option>--list-cleanup</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:517
+#: apt-get.8.xml:439
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -4409,17 +4302,17 @@ msgstr ""
 "fontes. Item de Configuração: <literal>APT::Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:448
 msgid "<option>--target-release</option>"
 msgstr "<option>--target-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:527
+#: apt-get.8.xml:449
 msgid "<option>--default-release</option>"
 msgstr "<option>--default-release</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:450
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -4442,12 +4335,12 @@ msgstr ""
 "Release</literal>; veja também o manual &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:541
+#: apt-get.8.xml:463
 msgid "<option>--trivial-only</option>"
 msgstr "<option>--trivial-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:465
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4461,12 +4354,12 @@ msgstr ""
 "Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
+#: apt-get.8.xml:471
 msgid "<option>--no-remove</option>"
 msgstr "<option>--no-remove</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:550
+#: apt-get.8.xml:472
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4476,12 +4369,12 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:477
 msgid "<option>--auto-remove</option>"
 msgstr "<option>--auto-remove</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:556
+#: apt-get.8.xml:478
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4494,12 +4387,12 @@ msgstr ""
 "Configuração: <literal>APT::Get::AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:562
+#: apt-get.8.xml:484
 msgid "<option>--only-source</option>"
 msgstr "<option>--only-source</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:563
+#: apt-get.8.xml:485
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -4518,22 +4411,22 @@ msgstr ""
 "<literal>APT::Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--diff-only</option>"
 msgstr "<option>--diff-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--dsc-only</option>"
 msgstr "<option>--dsc-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--tar-only</option>"
 msgstr "<option>--tar-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:574
+#: apt-get.8.xml:496
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4544,12 +4437,12 @@ msgstr ""
 "Only</literal>, e <literal>APT::Get::Tar-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:579
+#: apt-get.8.xml:501
 msgid "<option>--arch-only</option>"
 msgstr "<option>--arch-only</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:580
+#: apt-get.8.xml:502
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
@@ -4558,12 +4451,12 @@ msgstr ""
 "de Configuração: <literal>APT::Get::Arch-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:584
+#: apt-get.8.xml:506
 msgid "<option>--allow-unauthenticated</option>"
 msgstr "<option>--allow-unauthenticated</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:585
+#: apt-get.8.xml:507
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -4574,7 +4467,7 @@ msgstr ""
 "Get::AllowUnauthenticated</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:598
+#: apt-get.8.xml:520
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
@@ -4583,7 +4476,7 @@ msgstr ""
 "&file-statelists;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:607
+#: apt-get.8.xml:529
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -4594,7 +4487,7 @@ msgstr ""
 "&guidesdir;, &apt-preferences;, o Howto do APT."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:613
+#: apt-get.8.xml:535
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
@@ -4603,22 +4496,22 @@ msgstr ""
 "erro."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:616
+#: apt-get.8.xml:538
 msgid "ORIGINAL AUTHORS"
 msgstr "AUTORES ORIGINAIS"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:617
+#: apt-get.8.xml:539
 msgid "&apt-author.jgunthorpe;"
 msgstr "&apt-author.jgunthorpe;"
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:620
+#: apt-get.8.xml:542
 msgid "CURRENT AUTHORS"
 msgstr "AUTORES ACTUAIS"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:622
+#: apt-get.8.xml:544
 msgid "&apt-author.team;"
 msgstr "&apt-author.team;"
 
@@ -4632,21 +4525,8 @@ msgstr "apt-key"
 msgid "APT key management utility"
 msgstr "Utilitário de gestão de chaves do APT"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-key.8.xml:31
-msgid ""
-"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
-"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
-"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
-"arg>"
-msgstr ""
-"<command>apt-key</command> <arg><option>--keyring <replaceable>nome de "
-"ficheiro</replaceable></option></arg> <arg><replaceable>comando</"
-"replaceable></arg> <arg rep=\"repeat\"><option><replaceable>argumentos</"
-"replaceable></option></arg>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:40
+#: apt-key.8.xml:32
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -4657,84 +4537,91 @@ msgstr ""
 "estas chaves serão considerados de confiança."
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:46
+#: apt-key.8.xml:38
 msgid "Commands"
 msgstr "Comandos"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:48
-msgid "add <replaceable>filename</replaceable>"
-msgstr "add <replaceable>nome-de-ficheiro</replaceable>"
+#: apt-key.8.xml:40
+msgid "add &synopsis-param-filename;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:44
+#, fuzzy
+#| msgid ""
+#| "Add a new key to the list of trusted keys.  The key is read from "
+#| "<replaceable>filename</replaceable>, or standard input if "
+#| "<replaceable>filename</replaceable> is <literal>-</literal>."
 msgid ""
-"Add a new key to the list of trusted keys.  The key is read from "
-"<replaceable>filename</replaceable>, or standard input if "
-"<replaceable>filename</replaceable> is <literal>-</literal>."
+"Add a new key to the list of trusted keys.  The key is read from &synopsis-"
+"param-filename;, or standard input if &synopsis-param-filename; is <literal>-"
+"</literal>."
 msgstr ""
 "Adiciona uma chave nova à lista de chaves de confiança. A chave é lida de "
 "<replaceable>nome de ficheiro</replaceable>, ou entrada standard se "
 "<replaceable>nome de ficheiro</replaceable> for <literal>-</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:60
-msgid "del <replaceable>keyid</replaceable>"
-msgstr "del <replaceable>id de chave</replaceable>"
+#: apt-key.8.xml:52
+msgid "del &synopsis-param-keyid;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:64
+#: apt-key.8.xml:56
 msgid "Remove a key from the list of trusted keys."
 msgstr "Remove uma chave da lista de chaves de confiança."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:71
-msgid "export <replaceable>keyid</replaceable>"
-msgstr "export <replaceable>id de chave</replaceable>"
+#: apt-key.8.xml:63
+msgid "export &synopsis-param-keyid;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:75
-msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+#: apt-key.8.xml:67
+#, fuzzy
+#| msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr ""
 "Escreve o <replaceable>id de chave</replaceable> da chave na saída standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:74
 msgid "exportall"
 msgstr "exportall"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:86
+#: apt-key.8.xml:78
 msgid "Output all trusted keys to standard output."
 msgstr "Escreve todas as chaves de confiança na saída standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:85
 msgid "list"
 msgstr "list"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:97
+#: apt-key.8.xml:89
 msgid "List trusted keys."
 msgstr "Lista as chaves de confiança."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:96
 msgid "finger"
 msgstr "finger"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:108
+#: apt-key.8.xml:100
 msgid "List fingerprints of trusted keys."
 msgstr "Lista as fingerprints das chaves de confiança."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:107
 msgid "adv"
 msgstr "adv"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:119
+#: apt-key.8.xml:111
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
@@ -4743,7 +4630,7 @@ msgstr ""
 "chave pública."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:131
+#: apt-key.8.xml:123
 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 "
@@ -4753,14 +4640,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:141
+#: apt-key.8.xml:133
 #, fuzzy
 #| msgid "update"
 msgid "net-update"
 msgstr "update"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:137
 msgid ""
 "Work similar to the <command>update</command> command above, but get the "
 "archive keyring from an URI instead and validate it against a master key.  "
@@ -4771,7 +4658,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:154
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
@@ -4780,12 +4667,20 @@ msgstr ""
 "secção prévia."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:164
-msgid "--keyring <replaceable>filename</replaceable>"
-msgstr "--keyring <replaceable>nome-de-ficheiro</replaceable>"
+#: apt-key.8.xml:156
+msgid "--keyring &synopsis-param-filename;"
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:165
+#: apt-key.8.xml:157
+#, fuzzy
+#| msgid ""
+#| "With this option it is possible to specify a specific keyring file the "
+#| "command should operate on. The default is that a command is executed on "
+#| "the <filename>trusted.gpg</filename> file as well as on all parts in the "
+#| "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
+#| "gpg</filename> is the primary keyring which means that e.g. new keys are "
+#| "added to this one."
 msgid ""
 "With this option it is possible to specify a specific keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -4802,44 +4697,44 @@ msgstr ""
 "chaves são adicionadas a este."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:178
+#: apt-key.8.xml:170
 msgid "&file-trustedgpg;"
 msgstr "&file-trustedgpg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:180
+#: apt-key.8.xml:172
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:173
 msgid "Local trust database of archive keys."
 msgstr "Base de dados local de confiança de chaves de arquivos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:184
+#: apt-key.8.xml:176
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:177
 msgid "Keyring of Debian archive trusted keys."
 msgstr "Chaveiro das chaves de confiança dos arquivos Debian."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:188
+#: apt-key.8.xml:180
 msgid ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:181
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr "Chaveiro das chaves de confiança removidas dos arquivos Debian."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:198
+#: apt-key.8.xml:190
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
@@ -4867,34 +4762,8 @@ msgstr "apt-mark"
 msgid "mark/unmark a package as being automatically-installed"
 msgstr "marca/desmarca um pacote como sendo instalado automaticamente"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-mark.8.xml:39
-#, fuzzy
-#| msgid ""
-#| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
-#| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
-#| "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-#| "choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </"
-#| "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
-#| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
-msgid ""
-"  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
-"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
-"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> </group>"
-msgstr ""
-"  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-"f=<replaceable>NOME DE FICHEIRO</replaceable></option></arg> <group choice="
-"\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></arg> </"
-"arg> <arg choice=\"plain\">showauto</arg> </group>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:39
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
@@ -4903,7 +4772,7 @@ msgstr ""
 "sendo instalado automaticamente."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:61
+#: apt-mark.8.xml:43
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -4919,14 +4788,14 @@ msgstr ""
 "command> ou <command>aptitude</command> (exemplos)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:51
 #, fuzzy
 #| msgid "markauto"
 msgid "auto"
 msgstr "markauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:52
 #, fuzzy
 #| msgid ""
 #| "<literal>markauto</literal> is used to mark a package as being "
@@ -4942,12 +4811,12 @@ msgstr ""
 "nenhum pacote instalado manualmente depender deste pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:59
 msgid "manual"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:78
+#: apt-mark.8.xml:60
 #, fuzzy
 #| msgid ""
 #| "<literal>unmarkauto</literal> is used to mark a package as being manually "
@@ -4963,12 +4832,12 @@ msgstr ""
 "automaticamente se nenhum outro pacote depender dele."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:67
 msgid "hold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:68
 msgid ""
 "<literal>hold</literal> is used to mark a package as hold back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -4978,12 +4847,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:95
+#: apt-mark.8.xml:77
 msgid "unhold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:78
 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "
@@ -4996,12 +4865,12 @@ msgstr ""
 "instalados automaticamente com cada pacote numa linha nova."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:83
 msgid "showauto"
 msgstr "showauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:102
+#: apt-mark.8.xml:84
 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "
@@ -5016,14 +4885,14 @@ msgstr ""
 "instalados automaticamente com cada pacote numa linha nova."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:109
+#: apt-mark.8.xml:91
 #, fuzzy
 #| msgid "showauto"
 msgid "showmanual"
 msgstr "showauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:110
+#: apt-mark.8.xml:92
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -5031,14 +4900,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:116
+#: apt-mark.8.xml:98
 #, fuzzy
 #| msgid "showauto"
 msgid "showhold"
 msgstr "showauto"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:99
 #, fuzzy
 #| msgid ""
 #| "<literal>showauto</literal> is used to print a list of automatically "
@@ -5051,7 +4920,7 @@ msgstr ""
 "instalados automaticamente com cada pacote numa linha nova."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:130
+#: apt-mark.8.xml:112
 msgid ""
 "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
@@ -5059,7 +4928,7 @@ msgstr ""
 "option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:131
+#: apt-mark.8.xml:113
 msgid ""
 "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
 "option>"
@@ -5068,7 +4937,7 @@ msgstr ""
 "filename></option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:116
 msgid ""
 "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
 "filename> instead of the default location, which is "
@@ -5081,17 +4950,17 @@ msgstr ""
 "directório definido pelo Item de Configuração: <literal>Dir::State</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:146
+#: apt-mark.8.xml:128
 msgid "  &file-extended_states;"
 msgstr "  &file-extended_states;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:151
+#: apt-mark.8.xml:133
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr "&apt-get;,&aptitude;,&apt-conf;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:155
+#: apt-mark.8.xml:137
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -5438,21 +5307,8 @@ msgstr "apt-sortpkgs"
 msgid "Utility to sort package index files"
 msgstr "Utilitário para organizar ficheiros índice de pacotes"
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-sortpkgs.1.xml:39
-msgid ""
-"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-msgstr ""
-"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-"<arg><option>-o=<replaceable>string de configuração</replaceable></option></"
-"arg> <arg><option>-c=<replaceable>ficheiro</replaceable></option></arg> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>ficheiro</replaceable></arg>"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:48
+#: apt-sortpkgs.1.xml:39
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (Source index or "
 "Package index) and sort the records so that they are ordered by the package "
@@ -5465,19 +5321,19 @@ msgstr ""
 "registo de acordo com as regras de organização internas."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:54
+#: apt-sortpkgs.1.xml:45
 msgid "All output is sent to stdout, the input must be a seekable file."
 msgstr ""
 "Todas as saídas são enviadas para o stdout, a entrada tem de ser um ficheiro "
 "pesquisável."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:61
+#: apt-sortpkgs.1.xml:52
 msgid "<option>--source</option>"
 msgstr "<option>--source</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:63
+#: apt-sortpkgs.1.xml:54
 msgid ""
 "Use Source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
@@ -5486,7 +5342,7 @@ msgstr ""
 "SortPkgs::Source</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:77
+#: apt-sortpkgs.1.xml:68
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -6195,6 +6051,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:294
+#, fuzzy
+#| msgid ""
+#| "Two sub-options to limit the use of PDiffs are also available: With "
+#| "<literal>FileLimit</literal> can be specified how many PDiff files are "
+#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+#| "other hand is the maximum percentage of the size of all patches compared "
+#| "to the size of the targeted file. If one of these limits is exceeded the "
+#| "complete file is downloaded instead of the patches."
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: With "
 "<literal>FileLimit</literal> can be specified how many PDiff files are "
@@ -6260,7 +6124,7 @@ msgstr ""
 "A predefinição é verdadeiro."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:321 sources.list.5.xml:155
+#: apt.conf.5.xml:321 sources.list.5.xml:160
 msgid "http"
 msgstr "http"
 
@@ -6421,7 +6285,7 @@ msgstr ""
 "host&gt;::SslForceVersion</literal> é a opção po máquina correspondente."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:387 sources.list.5.xml:166
+#: apt.conf.5.xml:387 sources.list.5.xml:171
 msgid "ftp"
 msgstr "ftp"
 
@@ -6504,7 +6368,7 @@ msgstr ""
 "ligações IPv4. Note que a maioria dos servidores FTP não suporta RFC2428."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426 sources.list.5.xml:148
+#: apt.conf.5.xml:426 sources.list.5.xml:153
 msgid "cdrom"
 msgstr "cdrom"
 
@@ -9454,8 +9318,19 @@ msgid ""
 "will be downloaded."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:121
+msgid ""
+"<literal>trusted=yes</literal> can be set to indicate that packages from "
+"this source are always authenificated even if the <filename>Release</"
+"filename> file is not signed or the signature can't be checked. This "
+"disables parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context. <literal>trusted=no</literal> is the opposite which "
+"handles even correctly authenificated sources as not authenificated."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:123
+#: sources.list.5.xml:128
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -9469,12 +9344,12 @@ msgstr ""
 "Internet, por exemplo)."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:128
+#: sources.list.5.xml:133
 msgid "Some examples:"
 msgstr "Alguns exemplos:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:135
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -9486,17 +9361,17 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:141
 msgid "URI specification"
 msgstr "Especificação da URI"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:146
 msgid "file"
 msgstr "file"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:143
+#: sources.list.5.xml:148
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -9507,7 +9382,7 @@ msgstr ""
 "arquivos locais."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:150
+#: sources.list.5.xml:155
 msgid ""
 "The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -9517,7 +9392,7 @@ msgstr ""
 "fontes."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:157
+#: sources.list.5.xml:162
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -9534,7 +9409,7 @@ msgstr ""
 "método de autenticação seguro."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:173
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
@@ -9553,12 +9428,12 @@ msgstr ""
 "especificados no ficheiro de configuração serão ignorados."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:177
+#: sources.list.5.xml:182
 msgid "copy"
 msgstr "copy"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:179
+#: sources.list.5.xml:184
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -9570,17 +9445,17 @@ msgstr ""
 "com o APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
 msgid "rsh"
 msgstr "rsh"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
 msgid "ssh"
 msgstr "ssh"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:186
+#: sources.list.5.xml:191
 msgid ""
 "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
 "user and access the files. It is a good idea to do prior arrangements with "
@@ -9595,12 +9470,12 @@ msgstr ""
 "para executar as transferências de ficheiros remotos."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:199
 msgid "more recognizable URI types"
 msgstr "tipos de URI mais reconhecíveis"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:196
+#: sources.list.5.xml:201
 msgid ""
 "APT can be extended with more methods shipped in other optional packages "
 "which should follow the nameing scheme <literal>apt-transport-"
@@ -9622,7 +9497,7 @@ msgstr ""
 "<manvolnum>1</manvolnum></citerefentry>."
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:138
+#: sources.list.5.xml:143
 msgid ""
 "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
 "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -9631,7 +9506,7 @@ msgstr ""
 "ssh, rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:215
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
@@ -9640,36 +9515,36 @@ msgstr ""
 "para stable/main, stable/contrib, e stable/non-free."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:217
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:214
+#: sources.list.5.xml:219
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "Como em cima, excepto que usa a distribuição unstable (de desenvolvimento)."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:220
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:222
 msgid "Source line for the above"
 msgstr "Linha de fonte para o referido acima"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:223
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:225
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -9677,7 +9552,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:227
 #, fuzzy, no-wrap
 #| msgid ""
 #| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -9692,7 +9567,7 @@ msgstr ""
 "   "
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:230
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
@@ -9701,13 +9576,13 @@ msgstr ""
 "hamm/main."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
+#: sources.list.5.xml:232
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:229
+#: sources.list.5.xml:234
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
@@ -9716,13 +9591,13 @@ msgstr ""
 "usa apenas a área &stable-codename;/contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:231
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:238
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -9735,20 +9610,20 @@ msgstr ""
 "uma única sessão FTP para ambas linhas de recurso."
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:246
+#: sources.list.5.xml:251
 #, fuzzy, no-wrap
 #| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:244
 #, fuzzy
 #| msgid ""
 #| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
@@ -9776,7 +9651,7 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:256
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-cache; &apt-conf;"
 
@@ -11293,6 +11168,262 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 
+#, fuzzy
+#~| msgid ""
+#~| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
+#~| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
+#~| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> "
+#~| "<arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg "
+#~| "choice=\"plain\"><replaceable>regex</replaceable></arg></arg> <arg>show "
+#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
+#~| "arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
+#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~| "<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></"
+#~| "arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg>xvcg <arg choice="
+#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~| "<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</"
+#~| "replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkgs</replaceable></arg></arg> </group>"
+#~ msgid ""
+#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" "
+#~ "rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></"
+#~ "arg></arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> "
+#~ "<arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</"
+#~ "replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg>depends <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~ "<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~ "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
+#~ "\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+#~ "<arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+#~ "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
+#~ "group>"
+#~ msgstr ""
+#~ "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
+#~ "<arg><option>-o=<replaceable>string de configuração</replaceable></"
+#~ "option></arg> <arg><option>-c=<replaceable>ficheiro</replaceable></"
+#~ "option></arg> <group choice=\"req\"> <arg>add <arg choice=\"plain\" rep="
+#~ "\"repeat\"><replaceable>ficheiro</replaceable></arg></arg> "
+#~ "<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pacote</replaceable></arg></arg> <arg>showsrc <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></arg></arg> "
+#~ "<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
+#~ "<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
+#~ "arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</"
+#~ "replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pacote</replaceable></arg></arg> <arg>rdepends <arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></arg></"
+#~ "arg> <arg>pkgnames <arg choice=\"plain\"><replaceable>prefixo</"
+#~ "replaceable></arg></arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pacote</replaceable></arg></arg> <arg>xvcg <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></arg></arg> "
+#~ "<arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>pacotes</"
+#~ "replaceable></arg></arg> <arg>madison <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pacotes</replaceable></arg></arg> </group>"
+
+#~ msgid ""
+#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
+#~ "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></"
+#~ "arg> <arg><option>-o=<replaceable>config string</replaceable></option></"
+#~ "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> "
+#~ "<group> <arg>add</arg> <arg>ident</arg> </group>"
+#~ msgstr ""
+#~ "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
+#~ "<arg><option>-d=<replaceable>ponto de montagem do cdrom</replaceable></"
+#~ "option></arg> <arg><option>-o=<replaceable>string de configuração</"
+#~ "replaceable></option></arg> <arg><option>-c=<replaceable>ficheiro</"
+#~ "replaceable></option></arg> <group> <arg>add</arg> <arg>ident</arg> </"
+#~ "group>"
+
+#~ msgid ""
+#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
+#~ msgstr ""
+#~ "<command>apt-config</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-o=<replaceable>string de configuração</replaceable></"
+#~ "option></arg> <arg><option>-c=<replaceable>ficheiro</replaceable></"
+#~ "option></arg> <group choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </"
+#~ "group>"
+
+#~ msgid ""
+#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
+#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</"
+#~ "replaceable></arg>"
+#~ msgstr ""
+#~ "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-t=<replaceable>directório temporário</replaceable></"
+#~ "option></arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>ficheiro</"
+#~ "replaceable></arg>"
+
+#~ msgid ""
+#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
+#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
+#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+#~ "arg> <arg><option>--arch <replaceable>architecture</replaceable></"
+#~ "option></arg> <arg><option>-o <replaceable>config</"
+#~ "replaceable>=<replaceable>string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#~ "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
+#~ "replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
+#~ "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
+#~ "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
+#~ "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
+#~ "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
+#~ "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
+#~ "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
+#~ "group>"
+#~ msgstr ""
+#~ "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
+#~ "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
+#~ "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+#~ "arg> <arg><option>--arch <replaceable>arquitectura</replaceable></"
+#~ "option></arg> <arg><option>-o <replaceable>configuração</"
+#~ "replaceable>=<replaceable>string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>ficheiro</replaceable></option></arg> <group "
+#~ "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>caminho</replaceable></arg><arg><replaceable>override</"
+#~ "replaceable><arg><replaceable>prefixo-de-caminho</replaceable></arg></"
+#~ "arg></arg> <arg>sources<arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>caminho</replaceable></arg><arg><replaceable>sobrepor</"
+#~ "replaceable><arg><replaceable>prefixo-de-caminho</replaceable></arg></"
+#~ "arg></arg> <arg>contents <arg choice=\"plain\"><replaceable>caminho</"
+#~ "replaceable></arg></arg> <arg>release <arg choice=\"plain"
+#~ "\"><replaceable>caminho</replaceable></arg></arg> <arg>generate <arg "
+#~ "choice=\"plain\"><replaceable>ficheiro-de-configuração</replaceable></"
+#~ "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>secção</"
+#~ "replaceable></arg></arg> <arg>clean <arg choice=\"plain"
+#~ "\"><replaceable>ficheiro-de-configuração</replaceable></arg></arg> </"
+#~ "group>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#~| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
+#~| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </"
+#~| "arg> <arg> <option>-t=</option> <arg choice='plain'> "
+#~| "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
+#~| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
+#~| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
+#~| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
+#~| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
+#~| "<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </"
+#~| "arg> <arg choice='plain'> /<replaceable>target_release</replaceable> </"
+#~| "arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
+#~| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
+#~| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#~| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
+#~| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> "
+#~| "<arg> <group choice='req'> <arg choice='plain'> "
+#~| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+#~| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#~| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+#~| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#~| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#~| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#~| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#~| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#~| "help</arg> </group> </arg> </group>"
+#~ msgid ""
+#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#~ "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
+#~ "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
+#~ "<arg> <option>-t=</option> <arg choice='plain'> "
+#~ "<replaceable>target_release</replaceable> </arg> </arg> <group choice="
+#~ "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</"
+#~ "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-"
+#~ "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep="
+#~ "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
+#~ "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
+#~ "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#~ "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain"
+#~ "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
+#~ "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
+#~ "<group choice='req'> <arg choice='plain'> "
+#~ "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
+#~ "choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+#~ "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~ "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#~ "help</arg> </group> </arg> </group>"
+#~ msgstr ""
+#~ "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
+#~ "<option>-o= <replaceable>string_de_configuração</replaceable> </option> </"
+#~ "arg> <arg> <option>-c= <replaceable>ficheiro_de_configuração</"
+#~ "replaceable> </option> </arg> <arg> <option>-t=</option> <arg "
+#~ "choice='plain'> <replaceable>lançamento_de_destino</replaceable> </arg> </"
+#~ "arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
+#~ "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> "
+#~ "<arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
+#~ "<group choice='req'> <arg choice='plain'> "
+#~ "=<replaceable>número_de_versão_do_pacote</replaceable> </arg> <arg "
+#~ "choice='plain'> /<replaceable>lançamento_de_destino</replaceable> </arg> "
+#~ "</group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice="
+#~ "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+#~ "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pacote</replaceable></arg></arg> <arg "
+#~ "choice='plain'>source <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pacote</replaceable> <arg> <group choice='req'> <arg "
+#~ "choice='plain'> =<replaceable>número_de_versão_do_pacote</replaceable> </"
+#~ "arg> <arg choice='plain'> /<replaceable>lançamento_de_destino</"
+#~ "replaceable> </arg> </group> </arg> </arg> </arg> <arg "
+#~ "choice='plain'>build-dep <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pacote</replaceable></arg></arg> <arg "
+#~ "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+#~ "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+#~ "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+#~ "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
+#~ "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
+#~ "help</arg> </group> </arg> </group>"
+
+#~ msgid ""
+#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+#~ "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
+#~ "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
+#~ "option></arg>"
+#~ msgstr ""
+#~ "<command>apt-key</command> <arg><option>--keyring <replaceable>nome de "
+#~ "ficheiro</replaceable></option></arg> <arg><replaceable>comando</"
+#~ "replaceable></arg> <arg rep=\"repeat\"><option><replaceable>argumentos</"
+#~ "replaceable></option></arg>"
+
+#~ msgid "add <replaceable>filename</replaceable>"
+#~ msgstr "add <replaceable>nome-de-ficheiro</replaceable>"
+
+#~ msgid "del <replaceable>keyid</replaceable>"
+#~ msgstr "del <replaceable>id de chave</replaceable>"
+
+#~ msgid "export <replaceable>keyid</replaceable>"
+#~ msgstr "export <replaceable>id de chave</replaceable>"
+
 #~ msgid ""
 #~ "Update the local keyring with the keyring of Debian archive keys and "
 #~ "removes from the keyring the archive keys which are no longer valid."
@@ -11300,6 +11431,78 @@ msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 #~ "Actualiza o chaveiro local com o chaveiro das chaves de arquivos Debian e "
 #~ "remove do chaveiro as chaves de arquivo que já não são válidas."
 
+#~ msgid "--keyring <replaceable>filename</replaceable>"
+#~ msgstr "--keyring <replaceable>nome-de-ficheiro</replaceable>"
+
+#, fuzzy
+#~| msgid ""
+#~| "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#~| "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> "
+#~| "<group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> "
+#~| "<arg choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</"
+#~| "arg> </group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#~| "replaceable></arg> </arg> <arg choice=\"plain\">showauto</arg> </group>"
+#~ msgid ""
+#~ "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
+#~ "choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
+#~ "choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
+#~ "choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </"
+#~ "group> <arg choice=\"plain\" rep=\"repeat\"><replaceable>package</"
+#~ "replaceable></arg> </arg> </group>"
+#~ msgstr ""
+#~ "  <command>apt-mark</command> <arg><option>-hv</option></arg> "
+#~ "<arg><option>-f=<replaceable>NOME DE FICHEIRO</replaceable></option></"
+#~ "arg> <group choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req"
+#~ "\"> <arg choice=\"plain\">markauto</arg> <arg choice=\"plain"
+#~ "\">unmarkauto</arg> </group> <arg choice=\"plain\" rep=\"repeat"
+#~ "\"><replaceable>pacote</replaceable></arg> </arg> <arg choice=\"plain"
+#~ "\">showauto</arg> </group>"
+
+#~ msgid ""
+#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
+#~ "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
+#~ "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg "
+#~ "choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
+#~ msgstr ""
+#~ "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
+#~ "<arg><option>-o=<replaceable>string de configuração</replaceable></"
+#~ "option></arg> <arg><option>-c=<replaceable>ficheiro</replaceable></"
+#~ "option></arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>ficheiro</"
+#~ "replaceable></arg>"
+
+#, fuzzy
+#~| msgid ""
+#~| "Seconds the Release file should be considered valid after it was "
+#~| "created. The default is \"for ever\" (0) if the Release file of the "
+#~| "archive doesn't include a <literal>Valid-Until</literal> header.  If it "
+#~| "does then this date is the default. The date from the Release file or "
+#~| "the date specified by the creation time of the Release file "
+#~| "(<literal>Date</literal> header) plus the seconds specified with this "
+#~| "options are used to check if the validation of a file has expired by "
+#~| "using the earlier date of the two. Archive specific settings can be made "
+#~| "by appending the label of the archive to the option name."
+#~ msgid ""
+#~ "Seconds the Release file should be considered valid after it was created. "
+#~ "The default is \"for ever\" (0) if the Release file of the archive "
+#~ "doesn't include a <literal>Valid-Until</literal> header.  If it does then "
+#~ "this date is the default. The date from the Release file or the date "
+#~ "specified by the creation time of the Release file (<literal>Date</"
+#~ "literal> header) plus the seconds specified with this options are used to "
+#~ "check if the validation of a file has expired by using the earlier date "
+#~ "of the two. Archive specific settings can be made by appending the label "
+#~ "of the archive to the option name."
+#~ msgstr ""
+#~ "Segundos em que o ficheiro Release deve considerado válido após ser "
+#~ "criado. A predefinição é \"para sempre\" (0) se o ficheiro Release do "
+#~ "arquivo não conter um cabeçalho <literal>Valid-Until</literal>. Se o "
+#~ "tiver então esta data é a predefinida. A data do ficheiro Release ou a "
+#~ "data especificada pela hora de criação do do ficheiro Release (cabeçalho "
+#~ "<literal>Date</literal>) mais os segundos especificados com esta opção "
+#~ "são usados para verificar se a validação de um ficheiro já expirou ao "
+#~ "usar uma data anterior às duas. Definições específicas do Arquivo podem "
+#~ "ser feitas ao adicionar a etiqueta do arquivo ao nome da opção. "
+
 #~ msgid "<option>--md5</option>"
 #~ msgstr "<option>--md5</option>"
 
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index b14e5dcb4..ab6cae376 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
-"POT-Creation-Date: 2011-11-20 17:58+0100\n"
+"POT-Creation-Date: 2012-04-11 17:54+0300\n"
 "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"
@@ -503,7 +503,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:210
+#: apt.ent:211
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -518,6 +518,101 @@ msgid ""
 "\">\n"
 msgstr ""
 
+#. type: Plain text
+#: apt.ent:214
+msgid ""
+"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
+"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:217
+msgid ""
+"<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+"synopsis-config-file \"config_file\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:220
+msgid ""
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
+"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"\"target_release\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:223
+msgid ""
+"<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+"synopsis-architecture \"architecture\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:226
+msgid ""
+"<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+"--> <!ENTITY synopsis-pkg \"pkg\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:229
+msgid ""
+"<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
+"ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:232
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+"pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:235
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+"awesome --> <!ENTITY synopsis-regex \"regex\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:238
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
+"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:241
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
+"apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+"\"temporary_directory\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:244
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+"synopsis-filename \"filename\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:250
+msgid ""
+"<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive "
+"packages path override pathprefix --> <!ENTITY synopsis-path \"path\"> <!"
+"ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section "
+"\"section\"> <!ENTITY synopsis-override \"override\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:253
+msgid ""
+"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+msgstr ""
+
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:16
@@ -551,42 +646,18 @@ msgstr ""
 msgid "query the APT cache"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cache.8.xml:39
-msgid ""
-"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
-"<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
-"arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></arg></"
-"arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>policy <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></"
-"arg> </group>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
-#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121
-#: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43
-#: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36
+#: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38
+#: apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38
+#: apt-key.8.xml:30 apt-mark.8.xml:38 apt-secure.8.xml:43
+#: apt-sortpkgs.1.xml:38 apt.conf.5.xml:42 apt_preferences.5.xml:36
 #: sources.list.5.xml:36
 #, fuzzy
 msgid "Description"
 msgstr "Descrição"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:65
+#: apt-cache.8.xml:39
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -595,19 +666,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:70 apt-get.8.xml:127
+#: apt-cache.8.xml:44 apt-get.8.xml:44
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:74
+#: apt-cache.8.xml:48
 msgid "gencaches"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:75
+#: apt-cache.8.xml:49
 msgid ""
 "<literal>gencaches</literal> performs the same operation as <command>apt-get "
 "check</command>. It builds the source and package caches from the sources in "
@@ -615,12 +686,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:81
+#: apt-cache.8.xml:55
 msgid "showpkg <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:82
+#: apt-cache.8.xml:56
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -634,7 +705,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:94
+#: apt-cache.8.xml:68
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -650,7 +721,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:106
+#: apt-cache.8.xml:80
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -662,26 +733,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:89
 msgid "stats"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:89
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:118
+#: apt-cache.8.xml:92
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:122
+#: apt-cache.8.xml:96
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -690,7 +761,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:128
+#: apt-cache.8.xml:102
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -701,7 +772,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:136
+#: apt-cache.8.xml:110
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -710,7 +781,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:142
+#: apt-cache.8.xml:116
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -719,7 +790,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:149
+#: apt-cache.8.xml:123
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -729,7 +800,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:130
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache; this value is therefore at least equal to the number of "
@@ -739,19 +810,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:163
+#: apt-cache.8.xml:137
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:170
+#: apt-cache.8.xml:144
 msgid "showsrc <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:145
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -759,60 +830,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:176 apt-config.8.xml:87
+#: apt-cache.8.xml:150 apt-config.8.xml:75
 msgid "dump"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:151
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:181
+#: apt-cache.8.xml:155
 msgid "dumpavail"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:156
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:186
+#: apt-cache.8.xml:160
 msgid "unmet"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:161
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml:165
 msgid "show <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:166
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:171
 msgid "search <replaceable>regex [ regex ... ]</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:172
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see "
@@ -827,26 +898,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:211
+#: apt-cache.8.xml:185
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:215
+#: apt-cache.8.xml:189
 msgid "depends <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:216
+#: apt-cache.8.xml:190
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:220
+#: apt-cache.8.xml:194
 #, fuzzy
 msgid "rdepends <replaceable>pkg(s)</replaceable>"
 msgstr ""
@@ -854,19 +925,19 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:195
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:225
+#: apt-cache.8.xml:199
 msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml:200
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -876,7 +947,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:205
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -884,12 +955,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:236
+#: apt-cache.8.xml:210
 msgid "dotty <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:237
+#: apt-cache.8.xml:211
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -902,7 +973,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:246
+#: apt-cache.8.xml:220
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -911,29 +982,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:251
+#: apt-cache.8.xml:225
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
+#: apt-cache.8.xml:228
 msgid "xvcg <replaceable>pkg(s)</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:229
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:259
+#: apt-cache.8.xml:233
 msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:260
+#: apt-cache.8.xml:234
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -942,7 +1013,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:266
+#: apt-cache.8.xml:240
 #, fuzzy
 msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
 msgstr ""
@@ -950,7 +1021,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:267
+#: apt-cache.8.xml:241
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -962,24 +1033,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59
-#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126
-#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
+#: apt-cache.8.xml:252 apt-config.8.xml:84 apt-extracttemplates.1.xml:51
+#: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
+#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:577 apt.conf.5.xml:599
 msgid "options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:256
 msgid "<option>-p</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:256
 msgid "<option>--pkg-cache</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:283
+#: apt-cache.8.xml:257
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
@@ -987,18 +1058,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404
-#: apt-sortpkgs.1.xml:61
+#: apt-cache.8.xml:262 apt-ftparchive.1.xml:551 apt-get.8.xml:321
+#: apt-sortpkgs.1.xml:52
 msgid "<option>-s</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
+#: apt-cache.8.xml:262
 msgid "<option>--src-cache</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:263
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1008,17 +1079,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
+#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311
 msgid "<option>-q</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
+#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311
 msgid "<option>--quiet</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:271
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1027,17 +1098,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:277
 msgid "<option>-i</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:277
 msgid "<option>--important</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:304
+#: apt-cache.8.xml:278
 msgid ""
 "Print only important dependencies; for use with unmet and depends. Causes "
 "only Depends and Pre-Depends relations to be printed.  Configuration Item: "
@@ -1045,47 +1116,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
+#: apt-cache.8.xml:283
 msgid "<option>--no-pre-depends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:284
 msgid "<option>--no-depends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:285
 msgid "<option>--no-recommends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:286
 msgid "<option>--no-suggests</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:287
 msgid "<option>--no-conflicts</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:314
+#: apt-cache.8.xml:288
 msgid "<option>--no-breaks</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315
+#: apt-cache.8.xml:289
 msgid "<option>--no-replaces</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:290
 msgid "<option>--no-enhances</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:291
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -1095,35 +1166,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
+#: apt-cache.8.xml:297 apt-cdrom.8.xml:111 apt-get.8.xml:278
 msgid "<option>-f</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323
+#: apt-cache.8.xml:297
 msgid "<option>--full</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:324
+#: apt-cache.8.xml:298
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
-#: apt-get.8.xml:447
+#: apt-cache.8.xml:302 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563
+#: apt-get.8.xml:369
 msgid "<option>-a</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:302
 msgid "<option>--all-versions</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:303
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
@@ -1134,17 +1205,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:311
 msgid "<option>-g</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
+#: apt-cache.8.xml:311
 msgid "<option>--generate</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:312
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1152,29 +1223,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
+#: apt-cache.8.xml:317
 msgid "<option>--names-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343 apt-cdrom.8.xml:142
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:129
 msgid "<option>-n</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:318
 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:348
+#: apt-cache.8.xml:322
 msgid "<option>--all-names</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:323
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
@@ -1182,12 +1253,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:354
+#: apt-cache.8.xml:328
 msgid "<option>--recurse</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:355
+#: apt-cache.8.xml:329
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1195,12 +1266,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:360
+#: apt-cache.8.xml:334
 msgid "<option>--installed</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:362
+#: apt-cache.8.xml:336
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
@@ -1208,47 +1279,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
-#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:591
-#: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89
+#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513
+#: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
 msgid "&apt-commonoptions;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:596 apt-key.8.xml:175 apt-mark.8.xml:144
+#: apt-cache.8.xml:346 apt-get.8.xml:518 apt-key.8.xml:167 apt-mark.8.xml:126
 #: apt.conf.5.xml:1110 apt_preferences.5.xml:697
 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:348
 msgid "&file-sourceslist; &file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:606
-#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704
-#: sources.list.5.xml:250
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94
+#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528
+#: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
+#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704
+#: sources.list.5.xml:255
 #, fuzzy
 msgid "See Also"
 msgstr "Consulte também"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:380
+#: apt-cache.8.xml:354
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
-#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:612
-#: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99
+#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534
+#: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
 msgid "Diagnostics"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:385
+#: apt-cache.8.xml:359
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1271,18 +1342,8 @@ msgstr ""
 msgid "APT CDROM management utility"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cdrom.8.xml:38
-msgid ""
-"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
-"<arg>add</arg> <arg>ident</arg> </group>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
+#: apt-cdrom.8.xml:38
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -1291,7 +1352,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:45
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
@@ -1299,12 +1360,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:68
+#: apt-cdrom.8.xml:55
 msgid "add"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:69
+#: apt-cdrom.8.xml:56
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@ -1314,7 +1375,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:77
+#: apt-cdrom.8.xml:64
 msgid ""
 "APT uses a CDROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -1322,19 +1383,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:84
+#: apt-cdrom.8.xml:71
 msgid "ident"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:85
+#: apt-cdrom.8.xml:72
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:64
+#: apt-cdrom.8.xml:51
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present.  <placeholder type=\"variablelist"
@@ -1342,22 +1403,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:161
+#: apt-cdrom.8.xml:81 apt-key.8.xml:153
 msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
+#: apt-cdrom.8.xml:85 apt-ftparchive.1.xml:519 apt-get.8.xml:273
 msgid "<option>-d</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98
+#: apt-cdrom.8.xml:85
 msgid "<option>--cdrom</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:99
+#: apt-cdrom.8.xml:86
 msgid ""
 "Mount point; specify the location to mount the cdrom. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -1365,17 +1426,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
+#: apt-cdrom.8.xml:94
 msgid "<option>-r</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
+#: apt-cdrom.8.xml:94
 msgid "<option>--rename</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:108
+#: apt-cdrom.8.xml:95
 msgid ""
 "Rename a disc; change the label of a disk or override the disks given label. "
 "This option will cause <command>apt-cdrom</command> to prompt for a new "
@@ -1383,17 +1444,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116 apt-get.8.xml:375
+#: apt-cdrom.8.xml:103 apt-get.8.xml:292
 msgid "<option>-m</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116
+#: apt-cdrom.8.xml:103
 msgid "<option>--no-mount</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:117
+#: apt-cdrom.8.xml:104
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
@@ -1401,12 +1462,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:124
+#: apt-cdrom.8.xml:111
 msgid "<option>--fast</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:125
+#: apt-cdrom.8.xml:112
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1415,12 +1476,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:134
+#: apt-cdrom.8.xml:121
 msgid "<option>--thorough</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:135
+#: apt-cdrom.8.xml:122
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1428,22 +1489,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:143 apt-get.8.xml:406
+#: apt-cdrom.8.xml:130 apt-get.8.xml:323
 msgid "<option>--just-print</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:144 apt-get.8.xml:408
+#: apt-cdrom.8.xml:131 apt-get.8.xml:325
 msgid "<option>--recon</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:145 apt-get.8.xml:409
+#: apt-cdrom.8.xml:132 apt-get.8.xml:326
 msgid "<option>--no-act</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:133
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -1451,13 +1512,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:159
+#: apt-cdrom.8.xml:146
 #, fuzzy
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:164
+#: apt-cdrom.8.xml:151
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1482,17 +1543,8 @@ msgstr ""
 msgid "APT Configuration Query program"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-config.8.xml:39
-msgid ""
-"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
-"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
-"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> "
-"<arg>shell</arg> <arg>dump</arg> </group>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:51
+#: apt-config.8.xml:39
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -1501,19 +1553,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:56 apt-ftparchive.1.xml:75
+#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:61
+#: apt-config.8.xml:49
 msgid "shell"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:63
+#: apt-config.8.xml:51
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
@@ -1523,7 +1575,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:71
+#: apt-config.8.xml:59
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -1532,14 +1584,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:76
+#: apt-config.8.xml:64
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:80
+#: apt-config.8.xml:68
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -1547,13 +1599,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:89
+#: apt-config.8.xml:77
 msgid "Just show the contents of the configuration space."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
-#: apt-sortpkgs.1.xml:73
+#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-sortpkgs.1.xml:64
 #, fuzzy
 msgid "&apt-conf;"
 msgstr ""
@@ -1562,7 +1614,7 @@ msgstr ""
 " "
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112
+#: apt-config.8.xml:100
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
@@ -1583,17 +1635,8 @@ msgstr ""
 msgid "Utility to extract DebConf config and templates from Debian packages"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-extracttemplates.1.xml:39
-msgid ""
-"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-"<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
-"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></"
-"arg>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:39
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -1603,12 +1646,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:52
+#: apt-extracttemplates.1.xml:44
 msgid "package version template-file config-script"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:53
+#: apt-extracttemplates.1.xml:45
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
@@ -1617,17 +1660,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63 apt-get.8.xml:525
+#: apt-extracttemplates.1.xml:55 apt-get.8.xml:447
 msgid "<option>-t</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63
+#: apt-extracttemplates.1.xml:55
 msgid "<option>--tempdir</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:65
+#: apt-extracttemplates.1.xml:57
 msgid ""
 "Temporary directory in which to write extracted debconf template files and "
 "config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
@@ -1635,7 +1678,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:82
+#: apt-extracttemplates.1.xml:74
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
@@ -1659,31 +1702,8 @@ msgstr ""
 msgid "Utility to generate index files"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-ftparchive.1.xml:39
-msgid ""
-"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
-"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
-"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
-"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-"replaceable></arg><arg><replaceable>override</"
-"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></"
-"arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></"
-"arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</"
-"replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice="
-"\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:39
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -1692,7 +1712,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:64
+#: apt-ftparchive.1.xml:43
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
@@ -1702,7 +1722,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:70
+#: apt-ftparchive.1.xml:49
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -1712,12 +1732,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:79
+#: apt-ftparchive.1.xml:58
 msgid "packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:81
+#: apt-ftparchive.1.xml:60
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -1726,18 +1746,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
+#: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:89
+#: apt-ftparchive.1.xml:68
 msgid "sources"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:70
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -1746,7 +1766,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:75
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -1754,12 +1774,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:101
+#: apt-ftparchive.1.xml:80
 msgid "contents"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:103
+#: apt-ftparchive.1.xml:82
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
@@ -1770,12 +1790,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:113
+#: apt-ftparchive.1.xml:92
 msgid "release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:115
+#: apt-ftparchive.1.xml:94
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -1790,7 +1810,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:125
+#: apt-ftparchive.1.xml:104
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -1803,12 +1823,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml:115
 msgid "generate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:138
+#: apt-ftparchive.1.xml:117
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -1818,24 +1838,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
+#: apt-ftparchive.1.xml:124 apt-get.8.xml:215
 msgid "clean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:126
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:153
+#: apt-ftparchive.1.xml:132
 msgid "The Generate Configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:134
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -1846,19 +1866,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:163
+#: apt-ftparchive.1.xml:142
 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:144
 #, fuzzy
 msgid "Dir Section"
 msgstr "Descrição"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:146
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -1867,12 +1887,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:151
 msgid "ArchiveDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:153
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -1880,44 +1900,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:179
+#: apt-ftparchive.1.xml:158
 msgid "OverrideDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:160
 msgid "Specifies the location of the override files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:184
+#: apt-ftparchive.1.xml:163
 msgid "CacheDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:165
 msgid "Specifies the location of the cache files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:189
+#: apt-ftparchive.1.xml:168
 msgid "FileListDir"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:170
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:176
 msgid "Default Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:199
+#: apt-ftparchive.1.xml:178
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -1925,12 +1945,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
+#: apt-ftparchive.1.xml:182
 msgid "Packages::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:184
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
@@ -1939,72 +1959,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:190
 msgid "Packages::Extensions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:213
+#: apt-ftparchive.1.xml:192
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:196
 msgid "Sources::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:219
+#: apt-ftparchive.1.xml:198
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:202
 msgid "Sources::Extensions"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:225
+#: apt-ftparchive.1.xml:204
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:208
 msgid "Contents::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:210
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:214
 msgid "Translation::Compress"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:237
+#: apt-ftparchive.1.xml:216
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
+#: apt-ftparchive.1.xml:220
 msgid "DeLinkLimit"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:222
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
@@ -2012,37 +2032,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248
+#: apt-ftparchive.1.xml:227
 msgid "FileMode"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:229
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
+#: apt-ftparchive.1.xml:234 apt-ftparchive.1.xml:380
 #, fuzzy
 msgid "LongDescription"
 msgstr "Descrição"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+#: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:263
+#: apt-ftparchive.1.xml:242
 msgid "TreeDefault Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml:244
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -2050,12 +2070,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:249
 msgid "MaxContentsChange"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:272
+#: apt-ftparchive.1.xml:251
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
@@ -2063,12 +2083,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml:256
 msgid "ContentsAge"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:279
+#: apt-ftparchive.1.xml:258
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
@@ -2079,61 +2099,61 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:267
 msgid "Directory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:290
+#: apt-ftparchive.1.xml:269
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:273
 msgid "SrcDirectory"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:296
+#: apt-ftparchive.1.xml:275
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:418
 msgid "Packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:281
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:306 apt-ftparchive.1.xml:444
+#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:423
 msgid "Sources"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:287
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
+#: apt-ftparchive.1.xml:291
 #, fuzzy
 msgid "Translation"
 msgstr "Descrição"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:293
 msgid ""
 "Set the output Translation-en master file with the long descriptions if they "
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
@@ -2141,12 +2161,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319
+#: apt-ftparchive.1.xml:298
 msgid "InternalPrefix"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:300
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -2154,12 +2174,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
+#: apt-ftparchive.1.xml:305 apt-ftparchive.1.xml:429
 msgid "Contents"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:307
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
@@ -2168,34 +2188,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:314
 msgid "Contents::Header"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:316
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:340 apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:454
 msgid "BinCacheDB"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:342
+#: apt-ftparchive.1.xml:321
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml:325
 msgid "FileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:327
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -2203,12 +2223,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:353
+#: apt-ftparchive.1.xml:332
 msgid "SourceFileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:355
+#: apt-ftparchive.1.xml:334
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
@@ -2217,12 +2237,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:342
 msgid "Tree Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:365
+#: apt-ftparchive.1.xml:344
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -2232,7 +2252,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:349
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -2241,7 +2261,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:375
+#: apt-ftparchive.1.xml:354
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
@@ -2249,7 +2269,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:381
+#: apt-ftparchive.1.xml:360
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -2259,7 +2279,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:378
+#: apt-ftparchive.1.xml:357
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
@@ -2267,13 +2287,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
+#: apt-ftparchive.1.xml:366
 #, fuzzy
 msgid "Sections"
 msgstr "Descrição"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389
+#: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"
@@ -2281,12 +2301,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
+#: apt-ftparchive.1.xml:373 apt.conf.5.xml:157
 msgid "Architectures"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:375
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -2294,56 +2314,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
+#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:434
 msgid "BinOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:388
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:439
 msgid "SrcOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:415
+#: apt-ftparchive.1.xml:394
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
+#: apt-ftparchive.1.xml:398 apt-ftparchive.1.xml:444
 msgid "ExtraOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
 msgid "Sets the binary extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:424 apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:403 apt-ftparchive.1.xml:449
 msgid "SrcExtraOverride"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
+#: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
 msgid "Sets the source extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:431
+#: apt-ftparchive.1.xml:410
 msgid "BinDirectory Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:412
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -2353,64 +2373,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:441
+#: apt-ftparchive.1.xml:420
 msgid "Sets the Packages file output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:446
+#: apt-ftparchive.1.xml:425
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml:431
 msgid "Sets the Contents file output. (optional)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:457
+#: apt-ftparchive.1.xml:436
 msgid "Sets the binary override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:441
 msgid "Sets the source override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:477
+#: apt-ftparchive.1.xml:456
 msgid "Sets the cache DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:459
 msgid "PathPrefix"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:461
 msgid "Appends a path to all the output paths."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:464
 msgid "FileList, SourceFileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:466
 msgid "Specifies the file list file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:473
 msgid "The Binary Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:495
+#: apt-ftparchive.1.xml:474
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
@@ -2420,19 +2440,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:480
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:482
 #, no-wrap
 msgid "new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:500
+#: apt-ftparchive.1.xml:479
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -2443,12 +2463,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:490
 msgid "The Source Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:513
+#: apt-ftparchive.1.xml:492
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
@@ -2456,12 +2476,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:497
 msgid "The Extra Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:520
+#: apt-ftparchive.1.xml:499
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
@@ -2469,13 +2489,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml:508
 msgid ""
 "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml:510
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -2489,19 +2509,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:540
+#: apt-ftparchive.1.xml:519
 msgid "<option>--db</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:521
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:548
+#: apt-ftparchive.1.xml:527
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2510,12 +2530,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:554
+#: apt-ftparchive.1.xml:533
 msgid "<option>--delink</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:556
+#: apt-ftparchive.1.xml:535
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -2524,12 +2544,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:562
+#: apt-ftparchive.1.xml:541
 msgid "<option>--contents</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:564
+#: apt-ftparchive.1.xml:543
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -2539,12 +2559,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:572
+#: apt-ftparchive.1.xml:551
 msgid "<option>--source-override</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:553
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -2552,24 +2572,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:578
+#: apt-ftparchive.1.xml:557
 msgid "<option>--readonly</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:559
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:584
+#: apt-ftparchive.1.xml:563
 msgid "<option>--arch</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:585
+#: apt-ftparchive.1.xml:564
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -2578,12 +2598,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:591
+#: apt-ftparchive.1.xml:570
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:593
+#: apt-ftparchive.1.xml:572
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -2597,12 +2617,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:603
+#: apt-ftparchive.1.xml:582
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:605
+#: apt-ftparchive.1.xml:584
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2612,27 +2632,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544
-#: sources.list.5.xml:209
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1104 apt_preferences.5.xml:544
+#: sources.list.5.xml:214
 #, fuzzy
 msgid "Examples"
 msgstr "Exemplos"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:623
+#: apt-ftparchive.1.xml:602
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:619
+#: apt-ftparchive.1.xml:598
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:633
+#: apt-ftparchive.1.xml:612
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -2656,40 +2676,8 @@ msgstr ""
 msgid "APT package handling utility -- command-line interface"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-get.8.xml:39
-msgid ""
-"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
-"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
-"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
-"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> "
-"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice="
-"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
-"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
-"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
-"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
-"arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
-"<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-"<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
-"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
-"</group> </arg> </group>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:122
+#: apt-get.8.xml:39
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
@@ -2698,12 +2686,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:131 apt-key.8.xml:127
+#: apt-get.8.xml:48 apt-key.8.xml:119
 msgid "update"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:132
+#: apt-get.8.xml:49
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -2717,12 +2705,12 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:143 guide.sgml:121
+#: apt-get.8.xml:60 guide.sgml:121
 msgid "upgrade"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:144
+#: apt-get.8.xml:61
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -2737,12 +2725,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:156
+#: apt-get.8.xml:73
 msgid "dselect-upgrade"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:157
+#: apt-get.8.xml:74
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -2753,12 +2741,12 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:166 guide.sgml:140
+#: apt-get.8.xml:83 guide.sgml:140
 msgid "dist-upgrade"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:167
+#: apt-get.8.xml:84
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -2772,12 +2760,12 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
-#: apt-get.8.xml:179 guide.sgml:131
+#: apt-get.8.xml:96 guide.sgml:131
 msgid "install"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:181
+#: apt-get.8.xml:98
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -2793,7 +2781,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:116
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -2804,14 +2792,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:123
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:209
+#: apt-get.8.xml:126
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
@@ -2823,14 +2811,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:220
+#: apt-get.8.xml:137
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:141
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -2842,12 +2830,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:233
+#: apt-get.8.xml:150
 msgid "remove"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:151
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
@@ -2857,12 +2845,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:241
+#: apt-get.8.xml:158
 msgid "purge"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:242
+#: apt-get.8.xml:159
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -2870,12 +2858,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:246
+#: apt-get.8.xml:163
 msgid "source"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:247
+#: apt-get.8.xml:164
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -2887,7 +2875,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:255
+#: apt-get.8.xml:172
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> type lines in the &sources-list; file. This means that you "
@@ -2897,7 +2885,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:179
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -2907,7 +2895,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:186
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -2917,7 +2905,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:275
+#: apt-get.8.xml:192
 msgid ""
 "Note that source packages are not tracked like binary packages, they exist "
 "only in the current directory and are similar to downloading source tar "
@@ -2925,12 +2913,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:280
+#: apt-get.8.xml:197
 msgid "build-dep"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:281
+#: apt-get.8.xml:198
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -2940,31 +2928,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
+#: apt-get.8.xml:204
 msgid "check"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:205
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:209
 msgid "download"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:210
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:299
+#: apt-get.8.xml:216
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -2976,12 +2964,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:225
 msgid "autoclean"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:309
+#: apt-get.8.xml:226
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -2993,12 +2981,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:318
+#: apt-get.8.xml:235
 msgid "autoremove"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
+#: apt-get.8.xml:236
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -3006,12 +2994,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:323
+#: apt-get.8.xml:240
 msgid "changelog"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:241
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
@@ -3024,48 +3012,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:346
+#: apt-get.8.xml:263
 msgid "<option>--no-install-recommends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:264
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:351
+#: apt-get.8.xml:268
 msgid "<option>--install-suggests</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml:269
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:356
+#: apt-get.8.xml:273
 msgid "<option>--download-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:357
+#: apt-get.8.xml:274
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:361
+#: apt-get.8.xml:278
 msgid "<option>--fix-broken</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:362
+#: apt-get.8.xml:279
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
@@ -3081,17 +3069,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:375
+#: apt-get.8.xml:292
 msgid "<option>--ignore-missing</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:376
+#: apt-get.8.xml:293
 msgid "<option>--fix-missing</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:294
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -3103,12 +3091,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:387
+#: apt-get.8.xml:304
 msgid "<option>--no-download</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:388
+#: apt-get.8.xml:305
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -3116,7 +3104,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:395
+#: apt-get.8.xml:312
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3128,17 +3116,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:405
+#: apt-get.8.xml:322
 msgid "<option>--simulate</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:407
+#: apt-get.8.xml:324
 msgid "<option>--dry-run</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:410
+#: apt-get.8.xml:327
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -3146,7 +3134,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:331
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "
@@ -3157,7 +3145,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:337
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -3166,22 +3154,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:344
 msgid "<option>-y</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:344
 msgid "<option>--yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:428
+#: apt-get.8.xml:345
 msgid "<option>--assume-yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:429
+#: apt-get.8.xml:346
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -3191,46 +3179,58 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:353
+msgid "<option>--assume-no</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:354
+msgid ""
+"Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
+"Assume-No</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:358
 msgid "<option>-u</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:358
 msgid "<option>--show-upgraded</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:437
+#: apt-get.8.xml:359
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:364
 msgid "<option>-V</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:364
 msgid "<option>--verbose-versions</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:365
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:370
 msgid "<option>--host-architecture</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:449
+#: apt-get.8.xml:371
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
@@ -3241,34 +3241,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:379
 msgid "<option>-b</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:457
+#: apt-get.8.xml:379
 msgid "<option>--compile</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:458
+#: apt-get.8.xml:380
 msgid "<option>--build</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:459
+#: apt-get.8.xml:381
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
+#: apt-get.8.xml:385
 msgid "<option>--ignore-hold</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:464
+#: apt-get.8.xml:386
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -3277,12 +3277,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:470
+#: apt-get.8.xml:392
 msgid "<option>--no-upgrade</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:393
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -3291,12 +3291,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:477
+#: apt-get.8.xml:399
 msgid "<option>--only-upgrade</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:478
+#: apt-get.8.xml:400
 msgid ""
 "Do not install new packages; When used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will prevent packages on the "
@@ -3305,12 +3305,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:484
+#: apt-get.8.xml:406
 msgid "<option>--force-yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:485
+#: apt-get.8.xml:407
 msgid ""
 "Force yes; This is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
@@ -3320,12 +3320,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:492
+#: apt-get.8.xml:414
 msgid "<option>--print-uris</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:493
+#: apt-get.8.xml:415
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected md5 "
@@ -3338,12 +3338,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:503
+#: apt-get.8.xml:425
 msgid "<option>--purge</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:504
+#: apt-get.8.xml:426
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -3352,24 +3352,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:511
+#: apt-get.8.xml:433
 msgid "<option>--reinstall</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:434
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:516
+#: apt-get.8.xml:438
 msgid "<option>--list-cleanup</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:517
+#: apt-get.8.xml:439
 msgid ""
 "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
 "it off. When on <command>apt-get</command> will automatically manage the "
@@ -3380,17 +3380,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:526
+#: apt-get.8.xml:448
 msgid "<option>--target-release</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:527
+#: apt-get.8.xml:449
 msgid "<option>--default-release</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:450
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -3404,12 +3404,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:541
+#: apt-get.8.xml:463
 msgid "<option>--trivial-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:543
+#: apt-get.8.xml:465
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -3418,24 +3418,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:549
+#: apt-get.8.xml:471
 msgid "<option>--no-remove</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:550
+#: apt-get.8.xml:472
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:477
 msgid "<option>--auto-remove</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:556
+#: apt-get.8.xml:478
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "
@@ -3444,12 +3444,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:562
+#: apt-get.8.xml:484
 msgid "<option>--only-source</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:563
+#: apt-get.8.xml:485
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
@@ -3461,22 +3461,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--diff-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--dsc-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:573
+#: apt-get.8.xml:495
 msgid "<option>--tar-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:574
+#: apt-get.8.xml:496
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -3484,24 +3484,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:579
+#: apt-get.8.xml:501
 msgid "<option>--arch-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:580
+#: apt-get.8.xml:502
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:584
+#: apt-get.8.xml:506
 msgid "<option>--allow-unauthenticated</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:585
+#: apt-get.8.xml:507
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
@@ -3509,14 +3509,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:598
+#: apt-get.8.xml:520
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:607
+#: apt-get.8.xml:529
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -3524,29 +3524,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:613
+#: apt-get.8.xml:535
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:616
+#: apt-get.8.xml:538
 msgid "ORIGINAL AUTHORS"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:617
+#: apt-get.8.xml:539
 msgid "&apt-author.jgunthorpe;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:620
+#: apt-get.8.xml:542
 msgid "CURRENT AUTHORS"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:622
+#: apt-get.8.xml:544
 msgid "&apt-author.team;"
 msgstr ""
 
@@ -3560,17 +3560,8 @@ msgstr ""
 msgid "APT key management utility"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-key.8.xml:31
-msgid ""
-"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
-"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
-"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
-"arg>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:40
+#: apt-key.8.xml:32
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -3578,87 +3569,87 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:46
+#: apt-key.8.xml:38
 msgid "Commands"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:48
-msgid "add <replaceable>filename</replaceable>"
+#: apt-key.8.xml:40
+msgid "add &synopsis-param-filename;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:44
 msgid ""
-"Add a new key to the list of trusted keys.  The key is read from "
-"<replaceable>filename</replaceable>, or standard input if "
-"<replaceable>filename</replaceable> is <literal>-</literal>."
+"Add a new key to the list of trusted keys.  The key is read from &synopsis-"
+"param-filename;, or standard input if &synopsis-param-filename; is <literal>-"
+"</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:60
-msgid "del <replaceable>keyid</replaceable>"
+#: apt-key.8.xml:52
+msgid "del &synopsis-param-keyid;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:64
+#: apt-key.8.xml:56
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:71
-msgid "export <replaceable>keyid</replaceable>"
+#: apt-key.8.xml:63
+msgid "export &synopsis-param-keyid;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:75
-msgid "Output the key <replaceable>keyid</replaceable> to standard output."
+#: apt-key.8.xml:67
+msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:74
 msgid "exportall"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:86
+#: apt-key.8.xml:78
 msgid "Output all trusted keys to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:85
 msgid "list"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:97
+#: apt-key.8.xml:89
 msgid "List trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:96
 msgid "finger"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:108
+#: apt-key.8.xml:100
 msgid "List fingerprints of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:107
 msgid "adv"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:119
+#: apt-key.8.xml:111
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:131
+#: apt-key.8.xml:123
 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 "
@@ -3668,12 +3659,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:141
+#: apt-key.8.xml:133
 msgid "net-update"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:137
 msgid ""
 "Work similar to the <command>update</command> command above, but get the "
 "archive keyring from an URI instead and validate it against a master key.  "
@@ -3684,22 +3675,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:154
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:164
-#, fuzzy
-msgid "--keyring <replaceable>filename</replaceable>"
+#: apt-key.8.xml:156
+msgid "--keyring &synopsis-param-filename;"
 msgstr ""
-"<programlisting>\n"
-"apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:165
+#: apt-key.8.xml:157
 msgid ""
 "With this option it is possible to specify a specific keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -3710,44 +3698,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:178
+#: apt-key.8.xml:170
 msgid "&file-trustedgpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:180
+#: apt-key.8.xml:172
 #, fuzzy
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr "<filename>/etc/apt.conf</>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:173
 msgid "Local trust database of archive keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:184
+#: apt-key.8.xml:176
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:177
 msgid "Keyring of Debian archive trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:188
+#: apt-key.8.xml:180
 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:189
+#: apt-key.8.xml:181
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:198
+#: apt-key.8.xml:190
 #, fuzzy
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -3770,27 +3758,15 @@ msgstr ""
 msgid "mark/unmark a package as being automatically-installed"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-mark.8.xml:39
-msgid ""
-"  <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
-"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
-"\">auto</arg> <arg choice=\"plain\">manual</arg> <arg choice=\"plain"
-"\">showauto</arg> <arg choice=\"plain\">showmanual</arg> </group> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
-"arg> </group>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:39
 msgid ""
 "<command>apt-mark</command> will change whether a package has been marked as "
 "being automatically installed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:61
+#: apt-mark.8.xml:43
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -3800,12 +3776,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:69
+#: apt-mark.8.xml:51
 msgid "auto"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:52
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -3813,12 +3789,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
+#: apt-mark.8.xml:59
 msgid "manual"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:78
+#: apt-mark.8.xml:60
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -3826,12 +3802,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:67
 msgid "hold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:68
 msgid ""
 "<literal>hold</literal> is used to mark a package as hold back, which will "
 "prevent the package from being automatically installed, upgraded or "
@@ -3841,24 +3817,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:95
+#: apt-mark.8.xml:77
 msgid "unhold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:78
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:101
+#: apt-mark.8.xml:83
 msgid "showauto"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:102
+#: apt-mark.8.xml:84
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -3867,12 +3843,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:109
+#: apt-mark.8.xml:91
 msgid "showmanual"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:110
+#: apt-mark.8.xml:92
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -3880,32 +3856,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:116
+#: apt-mark.8.xml:98
 msgid "showhold"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:99
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:130
+#: apt-mark.8.xml:112
 msgid ""
 "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:131
+#: apt-mark.8.xml:113
 msgid ""
 "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
 "option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:116
 msgid ""
 "Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
 "filename> instead of the default location, which is "
@@ -3914,18 +3890,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:146
+#: apt-mark.8.xml:128
 msgid "  &file-extended_states;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:151
+#: apt-mark.8.xml:133
 #, fuzzy
 msgid "&apt-get;,&aptitude;,&apt-conf;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:155
+#: apt-mark.8.xml:137
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
@@ -4168,17 +4144,8 @@ msgstr ""
 msgid "Utility to sort package index files"
 msgstr ""
 
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-sortpkgs.1.xml:39
-msgid ""
-"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:48
+#: apt-sortpkgs.1.xml:39
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (Source index or "
 "Package index) and sort the records so that they are ordered by the package "
@@ -4187,24 +4154,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:54
+#: apt-sortpkgs.1.xml:45
 msgid "All output is sent to stdout, the input must be a seekable file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:61
+#: apt-sortpkgs.1.xml:52
 msgid "<option>--source</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:63
+#: apt-sortpkgs.1.xml:54
 msgid ""
 "Use Source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:77
+#: apt-sortpkgs.1.xml:68
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -4732,7 +4699,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:321 sources.list.5.xml:155
+#: apt.conf.5.xml:321 sources.list.5.xml:160
 msgid "http"
 msgstr ""
 
@@ -4836,7 +4803,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:387 sources.list.5.xml:166
+#: apt.conf.5.xml:387 sources.list.5.xml:171
 msgid "ftp"
 msgstr ""
 
@@ -4889,7 +4856,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426 sources.list.5.xml:148
+#: apt.conf.5.xml:426 sources.list.5.xml:153
 msgid "cdrom"
 msgstr ""
 
@@ -7461,8 +7428,19 @@ msgid ""
 "will be downloaded."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:121
+msgid ""
+"<literal>trusted=yes</literal> can be set to indicate that packages from "
+"this source are always authenificated even if the <filename>Release</"
+"filename> file is not signed or the signature can't be checked. This "
+"disables parts of &apt-secure; and should therefore only be used in a local "
+"and trusted context. <literal>trusted=no</literal> is the opposite which "
+"handles even correctly authenificated sources as not authenificated."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:123
+#: sources.list.5.xml:128
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -7471,13 +7449,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:128
+#: sources.list.5.xml:133
 #, fuzzy
 msgid "Some examples:"
 msgstr "Exemplos"
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:135
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
@@ -7486,17 +7464,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:141
 msgid "URI specification"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:141
+#: sources.list.5.xml:146
 msgid "file"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:143
+#: sources.list.5.xml:148
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -7504,14 +7482,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:150
+#: sources.list.5.xml:155
 msgid ""
 "The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:157
+#: sources.list.5.xml:162
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -7522,7 +7500,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:168
+#: sources.list.5.xml:173
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
@@ -7534,12 +7512,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:177
+#: sources.list.5.xml:182
 msgid "copy"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:179
+#: sources.list.5.xml:184
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -7547,17 +7525,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
 msgid "rsh"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:184
+#: sources.list.5.xml:189
 msgid "ssh"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:186
+#: sources.list.5.xml:191
 msgid ""
 "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
 "user and access the files. It is a good idea to do prior arrangements with "
@@ -7567,12 +7545,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:199
 msgid "more recognizable URI types"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:196
+#: sources.list.5.xml:201
 msgid ""
 "APT can be extended with more methods shipped in other optional packages "
 "which should follow the nameing scheme <literal>apt-transport-"
@@ -7585,49 +7563,49 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:138
+#: sources.list.5.xml:143
 msgid ""
 "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
 "rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:215
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:217
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:214
+#: sources.list.5.xml:219
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:220
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:222
 msgid "Source line for the above"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:223
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:225
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7635,7 +7613,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:227
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7643,33 +7621,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:230
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
+#: sources.list.5.xml:232
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:229
+#: sources.list.5.xml:234
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:231
+#: sources.list.5.xml:236
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:233
+#: sources.list.5.xml:238
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -7678,19 +7656,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:237
+#: sources.list.5.xml:242
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:246
+#: sources.list.5.xml:251
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:244
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7702,7 +7680,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:256
 #, fuzzy
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -8765,6 +8743,12 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 
 #, fuzzy
+#~ msgid "--keyring <replaceable>filename</replaceable>"
+#~ msgstr ""
+#~ "<programlisting>\n"
+#~ "apt-get install <replaceable>pacote</replaceable>/testing\n"
+
+#, fuzzy
 #~ msgid "to the version that is already installed (if any)."
 #~ msgstr "para a instância que já esteja instalada (caso exista)."
 
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 09a5cbb6d..dd94f58f1 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -117,8 +117,13 @@
    <itemizedlist><listitem><para><literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal>
    can be used to specify for which architectures packages information should
    be downloaded. If this option is not set all architectures defined by the
-   <literal>APT::Architectures</literal> option will be downloaded.</para>
-   </listitem></itemizedlist></para>
+   <literal>APT::Architectures</literal> option will be downloaded.</para></listitem>
+   <listitem><para><literal>trusted=yes</literal> can be set to indicate that packages
+   from this source are always authenificated even if the <filename>Release</filename> file
+   is not signed or the signature can't be checked. This disables parts of &apt-secure;
+   and should therefore only be used in a local and trusted context. <literal>trusted=no</literal>
+   is the opposite which handles even correctly authenificated sources as not authenificated.</para></listitem>
+   </itemizedlist></para>
 
    <para>It is important to list sources in order of preference, with the most
    preferred source listed first. Typically this will result in sorting
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index fabaaec1d..4efbecc8c 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -10,24 +10,25 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include "apt-ftparchive.h"
-    
+#include <config.h>
+
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/init.h>
-#include <config.h>
-#include <apti18n.h>
 #include <algorithm>
 
 #include <climits>
 #include <sys/time.h>
 #include <regex.h>
 
+#include "apt-ftparchive.h"
 #include "contents.h"
 #include "multicompress.h"
-#include "writer.h"    
+#include "writer.h"
+
+#include <apti18n.h>
 									/*}}}*/
 
 using namespace std;    
@@ -205,7 +206,7 @@ bool PackageMap::GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats)
    Packages.Output = 0;      // Just in case
    
    // Finish compressing
-   unsigned long Size;
+   unsigned long long Size;
    if (Comp.Finalize(Size) == false)
    {
       c0out << endl;
@@ -291,7 +292,7 @@ bool PackageMap::GenSources(Configuration &Setup,struct CacheDB::Stats &Stats)
    Sources.Output = 0;      // Just in case
    
    // Finish compressing
-   unsigned long Size;
+   unsigned long long Size;
    if (Comp.Finalize(Size) == false)
    {
       c0out << endl;
@@ -362,11 +363,11 @@ bool PackageMap::GenContents(Configuration &Setup,
       if (_error->PendingError() == true)
 	 return false;
       
-      unsigned long Size = Head.Size();
+      unsigned long long Size = Head.Size();
       unsigned char Buf[4096];
       while (Size != 0)
       {
-	 unsigned long ToRead = Size;
+	 unsigned long long ToRead = Size;
 	 if (Size > sizeof(Buf))
 	    ToRead = sizeof(Buf);
 	 
@@ -400,7 +401,7 @@ bool PackageMap::GenContents(Configuration &Setup,
    Contents.Finish();
    
    // Finish compressing
-   unsigned long Size;
+   unsigned long long Size;
    if (Comp.Finalize(Size) == false || _error->PendingError() == true)
    {
       c0out << endl;
@@ -586,7 +587,7 @@ void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
 /* */
 bool ShowHelp(CommandLine &CmdL)
 {
-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
 	    COMMON_ARCH,__DATE__,__TIME__);
    if (_config->FindB("version") == true)
       return true;
diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index 6573fa264..a8b637a80 100644
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -10,23 +10,26 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include "cachedb.h"
+#include <config.h>
 
-#include <apti18n.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/sha1.h>
-#include <apt-pkg/sha256.h>
+#include <apt-pkg/sha2.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/fileutl.h>
     
 #include <netinet/in.h>       // htonl, etc
+
+#include <apti18n.h>
+#include "cachedb.h"
 									/*}}}*/
 
 // CacheDB::ReadyDB - Ready the DB2					/*{{{*/
 // ---------------------------------------------------------------------
 /* This opens the DB2 file for caching package information */
-bool CacheDB::ReadyDB(string const &DB)
+bool CacheDB::ReadyDB(std::string const &DB)
 {
    int err;
 
@@ -46,7 +49,7 @@ bool CacheDB::ReadyDB(string const &DB)
    
    DBLoaded = false;
    Dbp = 0;
-   DBFile = string();
+   DBFile = std::string();
    
    if (DB.empty())
       return true;
@@ -160,9 +163,10 @@ bool CacheDB::GetCurStat()
 									/*}}}*/
 // CacheDB::GetFileInfo - Get all the info about the file		/*{{{*/
 // ---------------------------------------------------------------------
-bool CacheDB::GetFileInfo(string const &FileName, bool const &DoControl, bool const &DoContents,
+bool CacheDB::GetFileInfo(std::string const &FileName, bool const &DoControl, bool const &DoContents,
 				bool const &GenContentsOnly, bool const &DoMD5, bool const &DoSHA1,
-				bool const &DoSHA256, bool const &checkMtime)
+				bool const &DoSHA256, 	bool const &DoSHA512, 
+                          bool const &checkMtime)
 {
 	this->FileName = FileName;
 
@@ -190,7 +194,9 @@ bool CacheDB::GetFileInfo(string const &FileName, bool const &DoControl, bool co
 		|| (DoContents && LoadContents(GenContentsOnly) == false)
 		|| (DoMD5 && GetMD5(false) == false)
 		|| (DoSHA1 && GetSHA1(false) == false)
-		|| (DoSHA256 && GetSHA256(false) == false))
+		|| (DoSHA256 && GetSHA256(false) == false)
+		|| (DoSHA512 && GetSHA512(false) == false)
+           )
 	{
 		delete Fd;
 		Fd = NULL;
@@ -293,9 +299,9 @@ bool CacheDB::LoadContents(bool const &GenOnly)
 }
 									/*}}}*/
 
-static string bytes2hex(uint8_t *bytes, size_t length) {
+static std::string bytes2hex(uint8_t *bytes, size_t length) {
    char buf[3];
-   string space;
+   std::string space;
 
    space.reserve(length*2 + 1);
    for (size_t i = 0; i < length; i++) {
@@ -345,7 +351,7 @@ bool CacheDB::GetMD5(bool const &GenOnly)
       return false;
    }
    MD5Summation MD5;
-   if (Fd->Seek(0) == false || MD5.AddFD(Fd->Fd(),CurStat.FileSize) == false)
+   if (Fd->Seek(0) == false || MD5.AddFD(*Fd, CurStat.FileSize) == false)
       return false;
    
    MD5Res = MD5.Result();
@@ -376,7 +382,7 @@ bool CacheDB::GetSHA1(bool const &GenOnly)
       return false;
    }
    SHA1Summation SHA1;
-   if (Fd->Seek(0) == false || SHA1.AddFD(Fd->Fd(),CurStat.FileSize) == false)
+   if (Fd->Seek(0) == false || SHA1.AddFD(*Fd, CurStat.FileSize) == false)
       return false;
    
    SHA1Res = SHA1.Result();
@@ -407,7 +413,7 @@ bool CacheDB::GetSHA256(bool const &GenOnly)
       return false;
    }
    SHA256Summation SHA256;
-   if (Fd->Seek(0) == false || SHA256.AddFD(Fd->Fd(),CurStat.FileSize) == false)
+   if (Fd->Seek(0) == false || SHA256.AddFD(*Fd, CurStat.FileSize) == false)
       return false;
    
    SHA256Res = SHA256.Result();
@@ -416,6 +422,37 @@ bool CacheDB::GetSHA256(bool const &GenOnly)
    return true;
 }
 									/*}}}*/
+// CacheDB::GetSHA256 - Get the SHA256 hash				/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool CacheDB::GetSHA512(bool const &GenOnly)
+{
+   // Try to read the control information out of the DB.
+   if ((CurStat.Flags & FlSHA512) == FlSHA512)
+   {
+      if (GenOnly == true)
+	 return true;
+
+      SHA512Res = bytes2hex(CurStat.SHA512, sizeof(CurStat.SHA512));
+      return true;
+   }
+   
+   Stats.SHA512Bytes += CurStat.FileSize;
+	 
+   if (Fd == NULL && OpenFile() == false)
+   {
+      return false;
+   }
+   SHA512Summation SHA512;
+   if (Fd->Seek(0) == false || SHA512.AddFD(*Fd, CurStat.FileSize) == false)
+      return false;
+   
+   SHA512Res = SHA512.Result();
+   hex2bytes(CurStat.SHA512, SHA512Res.data(), sizeof(CurStat.SHA512));
+   CurStat.Flags |= FlSHA512;
+   return true;
+}
+									/*}}}*/
 // CacheDB::Finish - Write back the cache structure			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -464,7 +501,7 @@ bool CacheDB::Clean()
              stringcmp(Colon + 1, (char *)Key.data+Key.size,"cl") == 0 ||
              stringcmp(Colon + 1, (char *)Key.data+Key.size,"cn") == 0)
 	 {
-            if (FileExists(string((const char *)Key.data,Colon)) == true)
+            if (FileExists(std::string((const char *)Key.data,Colon)) == true)
 		continue;	     
 	 }
       }
diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h
index 0ba80909a..b9ced9418 100644
--- a/ftparchive/cachedb.h
+++ b/ftparchive/cachedb.h
@@ -13,16 +13,16 @@
 #define CACHEDB_H
 
 
+#include <apt-pkg/debfile.h>
 
 #include <db.h>
-#include <string>
-#include <apt-pkg/debfile.h>
 #include <inttypes.h>
 #include <sys/stat.h>
 #include <errno.h>
-    
+#include <string>
+
 #include "contents.h"
-    
+
 class CacheDB
 {
    protected:
@@ -34,7 +34,7 @@ class CacheDB
    DB *Dbp;
    bool DBLoaded;
    bool ReadOnly;
-   string DBFile;
+   std::string DBFile;
 
    // Generate a key for the DB of a given type
    inline void InitQuery(const char *Type)
@@ -70,23 +70,27 @@ class CacheDB
    bool GetMD5(bool const &GenOnly);
    bool GetSHA1(bool const &GenOnly);
    bool GetSHA256(bool const &GenOnly);
+   bool GetSHA512(bool const &GenOnly);
    
    // Stat info stored in the DB, Fixed types since it is written to disk.
    enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2),
-   	FlSize=(1<<3), FlSHA1=(1<<4), FlSHA256=(1<<5)};
+                  FlSize=(1<<3), FlSHA1=(1<<4), FlSHA256=(1<<5), 
+                  FlSHA512=(1<<6)};
+
    struct StatStore
    {
       uint32_t Flags;
       uint32_t mtime;          
-      uint32_t FileSize;
+      uint64_t FileSize;
       uint8_t  MD5[16];
       uint8_t  SHA1[20];
       uint8_t  SHA256[32];
+      uint8_t  SHA512[64];
    } CurStat;
    struct StatStore OldStat;
    
    // 'set' state
-   string FileName;
+   std::string FileName;
    FileFd *Fd;
    debDebFile *DebFile;
    
@@ -95,9 +99,10 @@ class CacheDB
    // Data collection helpers
    debDebFile::MemControlExtract Control;
    ContentsExtract Contents;
-   string MD5Res;
-   string SHA1Res;
-   string SHA256Res;
+   std::string MD5Res;
+   std::string SHA1Res;
+   std::string SHA256Res;
+   std::string SHA512Res;
    
    // Runtime statistics
    struct Stats
@@ -106,32 +111,40 @@ class CacheDB
       double MD5Bytes;
       double SHA1Bytes;
       double SHA256Bytes;
+      double SHA512Bytes;
       unsigned long Packages;
       unsigned long Misses;  
-      unsigned long DeLinkBytes;
+      unsigned long long DeLinkBytes;
       
       inline void Add(const Stats &S) {
-	 Bytes += S.Bytes; MD5Bytes += S.MD5Bytes; SHA1Bytes += S.SHA1Bytes; 
+	 Bytes += S.Bytes; 
+         MD5Bytes += S.MD5Bytes; 
+         SHA1Bytes += S.SHA1Bytes; 
 	 SHA256Bytes += S.SHA256Bytes;
-	 Packages += S.Packages; Misses += S.Misses; DeLinkBytes += S.DeLinkBytes;};
-      Stats() : Bytes(0), MD5Bytes(0), SHA1Bytes(0), SHA256Bytes(0), Packages(0), Misses(0), DeLinkBytes(0) {};
+	 SHA512Bytes += S.SHA512Bytes;
+	 Packages += S.Packages;
+         Misses += S.Misses; 
+         DeLinkBytes += S.DeLinkBytes;
+      };
+      Stats() : Bytes(0), MD5Bytes(0), SHA1Bytes(0), SHA256Bytes(0),
+		SHA512Bytes(0),Packages(0), Misses(0), DeLinkBytes(0) {};
    } Stats;
    
-   bool ReadyDB(string const &DB);
+   bool ReadyDB(std::string const &DB);
    inline bool DBFailed() {return Dbp != 0 && DBLoaded == false;};
    inline bool Loaded() {return DBLoaded == true;};
    
-   inline off_t GetFileSize(void) {return CurStat.FileSize;}
+   inline unsigned long long GetFileSize(void) {return CurStat.FileSize;}
    
-   bool SetFile(string const &FileName,struct stat St,FileFd *Fd);
-   bool GetFileInfo(string const &FileName, bool const &DoControl, bool const &DoContents, bool const &GenContentsOnly,
-		    bool const &DoMD5, bool const &DoSHA1, bool const &DoSHA256, bool const &checkMtime = false);
+   bool SetFile(std::string const &FileName,struct stat St,FileFd *Fd);
+   bool GetFileInfo(std::string const &FileName, bool const &DoControl, bool const &DoContents, bool const &GenContentsOnly,
+		    bool const &DoMD5, bool const &DoSHA1, bool const &DoSHA256, bool const &DoSHA512, bool const &checkMtime = false);
    bool Finish();   
    
    bool Clean();
    
-   CacheDB(string const &DB) : Dbp(0), Fd(NULL), DebFile(0) {ReadyDB(DB);};
-   ~CacheDB() {ReadyDB(string()); delete DebFile;};
+   CacheDB(std::string const &DB) : Dbp(0), Fd(NULL), DebFile(0) {TmpKey[0]='\0'; ReadyDB(DB);};
+   ~CacheDB() {ReadyDB(std::string()); delete DebFile;};
 };
     
 #endif
diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc
index eadced626..bbc5a1e2b 100644
--- a/ftparchive/contents.cc
+++ b/ftparchive/contents.cc
@@ -33,9 +33,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include "contents.h"
+#include <config.h>
 
-#include <apti18n.h>
 #include <apt-pkg/debfile.h>
 #include <apt-pkg/extracttar.h>
 #include <apt-pkg/error.h>
@@ -43,6 +42,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <malloc.h>
+
+#include <apti18n.h>
+#include "contents.h"
 									/*}}}*/
 
 // GenContents::~GenContents - Free allocated memory			/*{{{*/
@@ -347,7 +349,7 @@ bool ContentsExtract::DoItem(Item &Itm,int &Fd)
 // ContentsExtract::TakeContents - Load the contents data		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool ContentsExtract::TakeContents(const void *NewData,unsigned long Length)
+bool ContentsExtract::TakeContents(const void *NewData,unsigned long long Length)
 {
    if (Length == 0)
    {
@@ -378,7 +380,7 @@ bool ContentsExtract::TakeContents(const void *NewData,unsigned long Length)
 // ContentsExtract::Add - Read the contents data into the sorter	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void ContentsExtract::Add(GenContents &Contents,string const &Package)
+void ContentsExtract::Add(GenContents &Contents,std::string const &Package)
 {
    const char *Start = Data;
    char *Pkg = Contents.Mystrdup(Package.c_str());
diff --git a/ftparchive/contents.h b/ftparchive/contents.h
index 5b5092b66..4af9db574 100644
--- a/ftparchive/contents.h
+++ b/ftparchive/contents.h
@@ -12,9 +12,10 @@
     
 #include <stdlib.h>
 #include <stdio.h>
-#include <apt-pkg/debfile.h>
 #include <apt-pkg/dirstream.h>
 
+class debDebFile;
+
 class GenContents
 {
    struct Node
@@ -71,16 +72,16 @@ class ContentsExtract : public pkgDirStream
 
    // The Data Block
    char *Data;
-   unsigned long MaxSize;
-   unsigned long CurSize;
+   unsigned long long MaxSize;
+   unsigned long long CurSize;
    void AddData(const char *Text);
    
    bool Read(debDebFile &Deb);
    
    virtual bool DoItem(Item &Itm,int &Fd);      
    void Reset() {CurSize = 0;};
-   bool TakeContents(const void *Data,unsigned long Length);
-   void Add(GenContents &Contents,string const &Package);
+   bool TakeContents(const void *Data,unsigned long long Length);
+   void Add(GenContents &Contents,std::string const &Package);
    
    ContentsExtract() : Data(0), MaxSize(0), CurSize(0) {};
    virtual ~ContentsExtract() {delete [] Data;};
diff --git a/ftparchive/makefile b/ftparchive/makefile
index 504ebf893..c53ecff72 100644
--- a/ftparchive/makefile
+++ b/ftparchive/makefile
@@ -7,6 +7,7 @@ include ../buildlib/defaults.mak
 
 # The apt-ftparchive program
 ifdef BDBLIB
+APT_DOMAIN:=apt-utils
 PROGRAM=apt-ftparchive
 SLIBS = -lapt-pkg -lapt-inst $(BDBLIB) $(INTLLIBS)
 LIB_MAKES = apt-pkg/makefile apt-inst/makefile
@@ -15,6 +16,6 @@ SOURCE = apt-ftparchive.cc cachedb.cc writer.cc contents.cc override.cc \
 include $(PROGRAM_H)
 else
 PROGRAM=apt-ftparchive
-MESSAGE="Must have db2 to build apt-ftparchive"
+MESSAGE="Must have libdb to build apt-ftparchive"
 include $(FAIL_H)
 endif # ifdef BDBLIB
diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc
index 08853b0aa..1fea589e2 100644
--- a/ftparchive/multicompress.cc
+++ b/ftparchive/multicompress.cc
@@ -14,18 +14,21 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include "multicompress.h"
-    
-#include <apti18n.h>
+#include <config.h>
+
+#include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/md5.h>
-    
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <utime.h>
 #include <unistd.h>
-#include <iostream>    
+#include <iostream>
+
+#include "multicompress.h"
+#include <apti18n.h>
 									/*}}}*/
 
 using namespace std;
@@ -88,7 +91,7 @@ MultiCompress::MultiCompress(string const &Output,string const &Compress,
    /* Open all the temp files now so we can report any errors. File is 
       made unreable to prevent people from touching it during creating. */
    for (Files *I = Outputs; I != 0; I = I->Next)
-      I->TmpFile.Open(I->Output + ".new",FileFd::WriteEmpty,0600);
+      I->TmpFile.Open(I->Output + ".new", FileFd::WriteOnly | FileFd::Create | FileFd::Empty, FileFd::Extension, 0600);
    if (_error->PendingError() == true)
       return;
 
@@ -180,11 +183,6 @@ bool MultiCompress::Start()
       _exit(0);
    };
 
-   /* Tidy up the temp files, we open them in the constructor so as to
-      get proper error reporting. Close them now. */
-   for (Files *I = Outputs; I != 0; I = I->Next)
-      I->TmpFile.Close();
-   
    close(Pipe[0]);
    Input = fdopen(Pipe[1],"w");
    if (Input == 0)
@@ -213,7 +211,7 @@ bool MultiCompress::Die()
 // MultiCompress::Finalize - Finish up writing				/*{{{*/
 // ---------------------------------------------------------------------
 /* This is only necessary for statistics reporting. */
-bool MultiCompress::Finalize(unsigned long &OutSize)
+bool MultiCompress::Finalize(unsigned long long &OutSize)
 {
    OutSize = 0;
    if (Input == 0 || Die() == false)
@@ -259,77 +257,10 @@ bool MultiCompress::Finalize(unsigned long &OutSize)
    return true;
 }
 									/*}}}*/
-// MultiCompress::OpenCompress - Open the compressor			/*{{{*/
-// ---------------------------------------------------------------------
-/* This opens the compressor, either in compress mode or decompress 
-   mode. FileFd is always the compressor input/output file, 
-   OutFd is the created pipe, Input for Compress, Output for Decompress. */
-bool MultiCompress::OpenCompress(APT::Configuration::Compressor const &Prog,
-				 pid_t &Pid,int const &FileFd,int &OutFd,bool const &Comp)
-{
-   Pid = -1;
-   
-   // No compression
-   if (Prog.Binary.empty() == true)
-   {
-      OutFd = dup(FileFd);
-      return true;
-   }
-      
-   // Create a data pipe
-   int Pipe[2] = {-1,-1};
-   if (pipe(Pipe) != 0)
-      return _error->Errno("pipe",_("Failed to create subprocess IPC"));
-   for (int J = 0; J != 2; J++)
-      SetCloseExec(Pipe[J],true);
-
-   if (Comp == true)
-      OutFd = Pipe[1];
-   else
-      OutFd = Pipe[0];
-   
-   // The child..
-   Pid = ExecFork();
-   if (Pid == 0)
-   {
-      if (Comp == true)
-      {
-	 dup2(FileFd,STDOUT_FILENO);
-	 dup2(Pipe[0],STDIN_FILENO);
-      }   
-      else
-      {
-	 dup2(FileFd,STDIN_FILENO);
-	 dup2(Pipe[1],STDOUT_FILENO);
-      }
-      
-      SetCloseExec(STDOUT_FILENO,false);
-      SetCloseExec(STDIN_FILENO,false);
-
-      std::vector<char const*> Args;
-      Args.push_back(Prog.Binary.c_str());
-      std::vector<std::string> const * const addArgs =
-		(Comp == true) ? &(Prog.CompressArgs) : &(Prog.UncompressArgs);
-      for (std::vector<std::string>::const_iterator a = addArgs->begin();
-	   a != addArgs->end(); ++a)
-	 Args.push_back(a->c_str());
-      Args.push_back(NULL);
-
-      execvp(Args[0],(char **)&Args[0]);
-      cerr << _("Failed to exec compressor ") << Args[0] << endl;
-      _exit(100);
-   };      
-   if (Comp == true)
-      close(Pipe[0]);
-   else
-      close(Pipe[1]);
-   return true;
-}
-									/*}}}*/
 // MultiCompress::OpenOld - Open an old file				/*{{{*/
 // ---------------------------------------------------------------------
 /* This opens one of the original output files, possibly decompressing it. */
-bool MultiCompress::OpenOld(int &Fd,pid_t &Proc)
+bool MultiCompress::OpenOld(FileFd &Fd)
 {
    Files *Best = Outputs;
    for (Files *I = Outputs; I != 0; I = I->Next)
@@ -337,29 +268,9 @@ bool MultiCompress::OpenOld(int &Fd,pid_t &Proc)
 	 Best = I;
 
    // Open the file
-   FileFd F(Best->Output,FileFd::ReadOnly);
-   if (_error->PendingError() == true)
-      return false;
-   
-   // Decompress the file so we can read it
-   if (OpenCompress(Best->CompressProg,Proc,F.Fd(),Fd,false) == false)
-      return false;
-   
-   return true;
+   return Fd.Open(Best->Output, FileFd::ReadOnly, FileFd::Extension);
 }
 									/*}}}*/
-// MultiCompress::CloseOld - Close the old file				/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool MultiCompress::CloseOld(int Fd,pid_t Proc)
-{
-   close(Fd);
-   if (Proc != -1)
-      if (ExecWait(Proc,_("decompressor"),false) == false)
-	 return false;
-   return true;
-}   
-									/*}}}*/
 // MultiCompress::Child - The writer child				/*{{{*/
 // ---------------------------------------------------------------------
 /* The child process forks a bunch of compression children and takes 
@@ -369,19 +280,11 @@ bool MultiCompress::CloseOld(int Fd,pid_t Proc)
    is new then the temp files are renamed, otherwise they are erased. */
 bool MultiCompress::Child(int const &FD)
 {
-   // Start the compression children.
-   for (Files *I = Outputs; I != 0; I = I->Next)
-   {
-      if (OpenCompress(I->CompressProg,I->CompressProc,I->TmpFile.Fd(),
-		       I->Fd,true) == false)
-	 return false;      
-   }
-
    /* Okay, now we just feed data from FD to all the other FDs. Also
       stash a hash of the data to use later. */
    SetNonBlock(FD,false);
    unsigned char Buffer[32*1024];
-   unsigned long FileSize = 0;
+   unsigned long long FileSize = 0;
    MD5Summation MD5;
    while (1)
    {
@@ -396,25 +299,14 @@ bool MultiCompress::Child(int const &FD)
       FileSize += Res;
       for (Files *I = Outputs; I != 0; I = I->Next)
       {
-	 if (write(I->Fd,Buffer,Res) != Res)
+	 if (I->TmpFile.Write(Buffer, Res) == false)
 	 {
 	    _error->Errno("write",_("IO to subprocess/file failed"));
 	    break;
 	 }
       }      
    }   
-   
-   // Close all the writers
-   for (Files *I = Outputs; I != 0; I = I->Next)
-      close(I->Fd);
-   
-   // Wait for the compressors to exit
-   for (Files *I = Outputs; I != 0; I = I->Next)
-   {
-      if (I->CompressProc != -1)
-	 ExecWait(I->CompressProc, I->CompressProg.Binary.c_str(), false);
-   }
-   
+
    if (_error->PendingError() == true)
       return false;
    
@@ -433,31 +325,27 @@ bool MultiCompress::Child(int const &FD)
    // Check the MD5 of the lowest cost entity.
    while (Missing == false)
    {
-      int CompFd = -1;
-      pid_t Proc = -1;
-      if (OpenOld(CompFd,Proc) == false)
+      FileFd CompFd;
+      if (OpenOld(CompFd) == false)
       {
 	 _error->Discard();
 	 break;
       }
-            
+
       // Compute the hash
       MD5Summation OldMD5;
-      unsigned long NewFileSize = 0;
+      unsigned long long NewFileSize = 0;
       while (1)
       {
-	 int Res = read(CompFd,Buffer,sizeof(Buffer));
+	 unsigned long long Res = 0;
+	 if (CompFd.Read(Buffer,sizeof(Buffer), &Res) == false)
+	    return _error->Errno("read",_("Failed to read while computing MD5"));
 	 if (Res == 0)
 	    break;
-	 if (Res < 0)
-	    return _error->Errno("read",_("Failed to read while computing MD5"));
 	 NewFileSize += Res;
 	 OldMD5.Add(Buffer,Res);
       }
-      
-      // Tidy the compressor
-      if (CloseOld(CompFd,Proc) == false)
-	 return false;
+      CompFd.Close();
 
       // Check the hash
       if (OldMD5.Result() == MD5.Result() &&
diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h
index 19dede174..388fad22e 100644
--- a/ftparchive/multicompress.h
+++ b/ftparchive/multicompress.h
@@ -16,11 +16,10 @@
 #ifndef MULTICOMPRESS_H
 #define MULTICOMPRESS_H
 
-
-
-#include <string>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/aptconfiguration.h>
+
+#include <string>
 #include <stdio.h>
 #include <sys/types.h>
     
@@ -29,21 +28,18 @@ class MultiCompress
    // An output file
    struct Files
    {
-      string Output;
+      std::string Output;
       APT::Configuration::Compressor CompressProg;
       Files *Next;
       FileFd TmpFile;
       pid_t CompressProc;
       time_t OldMTime;
-      int Fd;
    };
    
    Files *Outputs;
    pid_t Outputter;
    mode_t Permissions;
 
-   bool OpenCompress(APT::Configuration::Compressor const &Prog,
-		     pid_t &Pid,int const &FileFd, int &OutFd,bool const &Comp);
    bool Child(int const &Fd);
    bool Start();
    bool Die();
@@ -54,12 +50,11 @@ class MultiCompress
    FILE *Input;
    unsigned long UpdateMTime;
    
-   bool Finalize(unsigned long &OutSize);
-   bool OpenOld(int &Fd,pid_t &Proc);
-   bool CloseOld(int Fd,pid_t Proc);
-   static bool GetStat(string const &Output,string const &Compress,struct stat &St);
+   bool Finalize(unsigned long long &OutSize);
+   bool OpenOld(FileFd &Fd);
+   static bool GetStat(std::string const &Output,std::string const &Compress,struct stat &St);
    
-   MultiCompress(string const &Output,string const &Compress,
+   MultiCompress(std::string const &Output,std::string const &Compress,
 		 mode_t const &Permissions, bool const &Write = true);
    ~MultiCompress();
 };
diff --git a/ftparchive/override.cc b/ftparchive/override.cc
index bd583a66f..d363fd0fe 100644
--- a/ftparchive/override.cc
+++ b/ftparchive/override.cc
@@ -10,14 +10,14 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include "override.h"
-    
+#include <config.h>
+
 #include <apti18n.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 
 #include <stdio.h>
-    
+
 #include "override.h"
 									/*}}}*/
 
@@ -34,7 +34,7 @@ bool Override::ReadOverride(string const &File,bool const &Source)
       return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
    
    char Line[500];
-   unsigned long Counter = 0;
+   unsigned long long Counter = 0;
    while (fgets(Line,sizeof(Line),F) != 0)
    {
       Counter++;
@@ -57,7 +57,7 @@ bool Override::ReadOverride(string const &File,bool const &Source)
       for (; isspace(*End) == 0 && *End != 0; End++);
       if (*End == 0)
       {
-	 _error->Warning(_("Malformed override %s line %lu #1"),File.c_str(),
+	 _error->Warning(_("Malformed override %s line %llu #1"),File.c_str(),
 			 Counter);
 	 continue;
       }      
@@ -71,7 +71,7 @@ bool Override::ReadOverride(string const &File,bool const &Source)
 	 for (; isspace(*End) == 0 && *End != 0; End++);
 	 if (*End == 0)
 	 {
-	    _error->Warning(_("Malformed override %s line %lu #2"),File.c_str(),
+	    _error->Warning(_("Malformed override %s line %llu #2"),File.c_str(),
 			    Counter);
 	    continue;
 	 }
@@ -85,7 +85,7 @@ bool Override::ReadOverride(string const &File,bool const &Source)
       for (; isspace(*End) == 0 && *End != 0; End++);
       if (*End == 0)
       {
-	 _error->Warning(_("Malformed override %s line %lu #3"),File.c_str(),
+	 _error->Warning(_("Malformed override %s line %llu #3"),File.c_str(),
 			 Counter);
 	 continue;
       }      
@@ -142,7 +142,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &Source)
       return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
   
    char Line[500];
-   unsigned long Counter = 0;
+   unsigned long long Counter = 0;
    while (fgets(Line,sizeof(Line),F) != 0)
    {
       Counter++;
@@ -163,7 +163,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &Source)
       for (; isspace(*End) == 0 && *End != 0; End++);
       if (*End == 0)
       {
-	 _error->Warning(_("Malformed override %s line %lu #1"),File.c_str(),
+	 _error->Warning(_("Malformed override %s line %llu #1"),File.c_str(),
 			 Counter);
 	 continue;
       }      
@@ -175,7 +175,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &Source)
       for (; isspace(*End) == 0 && *End != 0; End++);
       if (*End == 0)
       {
-	 _error->Warning(_("Malformed override %s line %lu #2"),File.c_str(),
+	 _error->Warning(_("Malformed override %s line %llu #2"),File.c_str(),
 			 Counter);
 	 continue;
       }
@@ -188,7 +188,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &Source)
       for (; isspace(*(End-1)) && End > Value; End--);
       if (End == Value)
       {
-	 _error->Warning(_("Malformed override %s line %lu #3"),File.c_str(),
+	 _error->Warning(_("Malformed override %s line %llu #3"),File.c_str(),
 			 Counter);
 	 continue;
       }      
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 7837ce6ce..d02919969 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -11,16 +11,14 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include "writer.h"
-    
-#include <apti18n.h>
+#include <config.h>
+
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/md5.h>
-#include <apt-pkg/sha1.h>
-#include <apt-pkg/sha256.h>
+#include <apt-pkg/hashes.h>
 #include <apt-pkg/deblistparser.h>
 
 #include <sys/types.h>
@@ -31,10 +29,13 @@
 #include <iostream>
 #include <sstream>
 #include <memory>
-    
+
+#include "writer.h"
 #include "cachedb.h"
 #include "apt-ftparchive.h"
 #include "multicompress.h"
+
+#include <apti18n.h>
 									/*}}}*/
 using namespace std;
 FTWScanner *FTWScanner::Owner;
@@ -64,6 +65,7 @@ FTWScanner::FTWScanner(string const &Arch): Arch(Arch)
    DoMD5 = _config->FindB("APT::FTPArchive::MD5",true);
    DoSHA1 = _config->FindB("APT::FTPArchive::SHA1",true);
    DoSHA256 = _config->FindB("APT::FTPArchive::SHA256",true);
+   DoSHA512 = _config->FindB("APT::FTPArchive::SHA512",true);
 }
 									/*}}}*/
 // FTWScanner::Scanner - FTW Scanner					/*{{{*/
@@ -246,8 +248,8 @@ bool FTWScanner::LoadFileList(string const &Dir, string const &File)
 // ---------------------------------------------------------------------
 /* */
 bool FTWScanner::Delink(string &FileName,const char *OriginalPath,
-			unsigned long &DeLinkBytes,
-			off_t const &FileSize)
+			unsigned long long &DeLinkBytes,
+			unsigned long long const &FileSize)
 {
    // See if this isn't an internaly prefix'd file name.
    if (InternalPrefix.empty() == false &&
@@ -316,6 +318,7 @@ PackagesWriter::PackagesWriter(string const &DB,string const &Overrides,string c
    DoMD5 = _config->FindB("APT::FTPArchive::Packages::MD5",DoMD5);
    DoSHA1 = _config->FindB("APT::FTPArchive::Packages::SHA1",DoSHA1);
    DoSHA256 = _config->FindB("APT::FTPArchive::Packages::SHA256",DoSHA256);
+   DoSHA256 = _config->FindB("APT::FTPArchive::Packages::SHA512",true);
    DoAlwaysStat = _config->FindB("APT::FTPArchive::AlwaysStat", false);
    DoContents = _config->FindB("APT::FTPArchive::Contents",true);
    NoOverride = _config->FindB("APT::FTPArchive::NoOverrideMsg",false);
@@ -370,13 +373,13 @@ bool FTWScanner::SetExts(string const &Vals)
 bool PackagesWriter::DoPackage(string FileName)
 {      
    // Pull all the data we need form the DB
-   if (Db.GetFileInfo(FileName, true, DoContents, true, DoMD5, DoSHA1, DoSHA256, DoAlwaysStat)
+   if (Db.GetFileInfo(FileName, true, DoContents, true, DoMD5, DoSHA1, DoSHA256, DoSHA512, DoAlwaysStat)
 		  == false)
    {
       return false;
    }
 
-   off_t FileSize = Db.GetFileSize();
+   unsigned long long FileSize = Db.GetFileSize();
    if (Delink(FileName,OriginalPath,Stats.DeLinkBytes,FileSize) == false)
       return false;
    
@@ -412,7 +415,7 @@ bool PackagesWriter::DoPackage(string FileName)
    }
 
    char Size[40];
-   sprintf(Size,"%lu", (unsigned long) FileSize);
+   sprintf(Size,"%llu", (unsigned long long) FileSize);
    
    // Strip the DirStrip prefix from the FileName and add the PathPrefix
    string NewFileName;
@@ -446,6 +449,8 @@ bool PackagesWriter::DoPackage(string FileName)
       SetTFRewriteData(Changes[End++], "SHA1", Db.SHA1Res.c_str());
    if (DoSHA256 == true)
       SetTFRewriteData(Changes[End++], "SHA256", Db.SHA256Res.c_str());
+   if (DoSHA512 == true)
+      SetTFRewriteData(Changes[End++], "SHA512", Db.SHA512Res.c_str());
    SetTFRewriteData(Changes[End++], "Filename", NewFileName.c_str());
    SetTFRewriteData(Changes[End++], "Priority", OverItem->Priority.c_str());
    SetTFRewriteData(Changes[End++], "Status", 0);
@@ -607,7 +612,7 @@ bool SourcesWriter::DoPackage(string FileName)
    if (St.st_size > 128*1024)
       return _error->Error("DSC file '%s' is too large!",FileName.c_str());
          
-   if (BufSize < (unsigned)St.st_size+1)
+   if (BufSize < (unsigned long long)St.st_size+1)
    {
       BufSize = St.st_size+1;
       Buffer = (char *)realloc(Buffer,St.st_size+1);
@@ -623,6 +628,7 @@ bool SourcesWriter::DoPackage(string FileName)
    MD5Summation MD5;
    SHA1Summation SHA1;
    SHA256Summation SHA256;
+   SHA256Summation SHA512;
 
    if (DoMD5 == true)
       MD5.Add((unsigned char *)Start,BlkEnd - Start);
@@ -630,6 +636,8 @@ bool SourcesWriter::DoPackage(string FileName)
       SHA1.Add((unsigned char *)Start,BlkEnd - Start);
    if (DoSHA256 == true)
       SHA256.Add((unsigned char *)Start,BlkEnd - Start);
+   if (DoSHA512 == true)
+      SHA512.Add((unsigned char *)Start,BlkEnd - Start);
 
    // Add an extra \n to the end, just in case
    *BlkEnd++ = '\n';
@@ -740,6 +748,12 @@ bool SourcesWriter::DoPackage(string FileName)
 		   << strippedName << "\n " << Tags.FindS("Checksums-Sha256");
    string const ChecksumsSha256 = ostreamSha256.str();
 
+   std::ostringstream ostreamSha512;
+   if (Tags.Exists("Checksums-Sha512"))
+      ostreamSha512 << "\n " << string(SHA512.Result()) << " " << St.st_size << " "
+		   << strippedName << "\n " << Tags.FindS("Checksums-Sha512");
+   string const ChecksumsSha512 = ostreamSha512.str();
+
    // Strip the DirStrip prefix from the FileName and add the PathPrefix
    string NewFileName;
    if (DirStrip.empty() == false &&
@@ -795,6 +809,8 @@ bool SourcesWriter::DoPackage(string FileName)
       SetTFRewriteData(Changes[End++],"Checksums-Sha1",ChecksumsSha1.c_str());
    if (ChecksumsSha256.empty() == false)
       SetTFRewriteData(Changes[End++],"Checksums-Sha256",ChecksumsSha256.c_str());
+   if (ChecksumsSha512.empty() == false)
+      SetTFRewriteData(Changes[End++],"Checksums-Sha512",ChecksumsSha512.c_str());
    if (Directory != "./")
       SetTFRewriteData(Changes[End++],"Directory",Directory.c_str());
    SetTFRewriteData(Changes[End++],"Priority",BestPrio.c_str());
@@ -873,22 +889,16 @@ bool ContentsWriter::ReadFromPkgs(string const &PkgFile,string const &PkgCompres
    MultiCompress Pkgs(PkgFile,PkgCompress,0,false);
    if (_error->PendingError() == true)
       return false;
-   
+
    // Open the package file
-   int CompFd = -1;
-   pid_t Proc = -1;
-   if (Pkgs.OpenOld(CompFd,Proc) == false)
+   FileFd Fd;
+   if (Pkgs.OpenOld(Fd) == false)
       return false;
-   
-   // No auto-close FD
-   FileFd Fd(CompFd,false);   
+
    pkgTagFile Tags(&Fd);
    if (_error->PendingError() == true)
-   {
-      Pkgs.CloseOld(CompFd,Proc);
       return false;
-   }
-   
+
    // Parse.
    pkgTagSection Section;
    while (Tags.Step(Section) == true)
@@ -910,11 +920,10 @@ bool ContentsWriter::ReadFromPkgs(string const &PkgFile,string const &PkgCompres
 	 _error->DumpErrors();
       }
    }
-   
+
    // Tidy the compressor
-   if (Pkgs.CloseOld(CompFd,Proc) == false)
-      return false;
-   
+   Fd.Close();
+
    return true;
 }
 
@@ -932,6 +941,7 @@ ReleaseWriter::ReleaseWriter(string const &DB)
       AddPattern("Packages.bz2");
       AddPattern("Packages.lzma");
       AddPattern("Packages.xz");
+      AddPattern("Translation-*");
       AddPattern("Sources");
       AddPattern("Sources.gz");
       AddPattern("Sources.bz2");
@@ -1025,29 +1035,18 @@ bool ReleaseWriter::DoPackage(string FileName)
 
    CheckSums[NewFileName].size = fd.Size();
 
+   Hashes hs;
+   hs.AddFD(fd, 0, DoMD5, DoSHA1, DoSHA256, DoSHA512);
    if (DoMD5 == true)
-   {
-      MD5Summation MD5;
-      MD5.AddFD(fd.Fd(), fd.Size());
-      CheckSums[NewFileName].MD5 = MD5.Result();
-      fd.Seek(0);
-   }
+      CheckSums[NewFileName].MD5 = hs.MD5.Result();
    if (DoSHA1 == true)
-   {
-      SHA1Summation SHA1;
-      SHA1.AddFD(fd.Fd(), fd.Size());
-      CheckSums[NewFileName].SHA1 = SHA1.Result();
-      fd.Seek(0);
-   }
+      CheckSums[NewFileName].SHA1 = hs.SHA1.Result();
    if (DoSHA256 == true)
-   {
-      SHA256Summation SHA256;
-      SHA256.AddFD(fd.Fd(), fd.Size());
-      CheckSums[NewFileName].SHA256 = SHA256.Result();
-   }
-
+      CheckSums[NewFileName].SHA256 = hs.SHA256.Result();
+   if (DoSHA512 == true)
+      CheckSums[NewFileName].SHA512 = hs.SHA512.Result();
    fd.Close();
-   
+
    return true;
 }
 
@@ -1062,7 +1061,7 @@ void ReleaseWriter::Finish()
       for(map<string,struct CheckSum>::const_iterator I = CheckSums.begin();
 	  I != CheckSums.end(); ++I)
       {
-	 fprintf(Output, " %s %16ld %s\n",
+	 fprintf(Output, " %s %16llu %s\n",
 		 (*I).second.MD5.c_str(),
 		 (*I).second.size,
 		 (*I).first.c_str());
@@ -1074,7 +1073,7 @@ void ReleaseWriter::Finish()
       for(map<string,struct CheckSum>::const_iterator I = CheckSums.begin();
 	  I != CheckSums.end(); ++I)
       {
-	 fprintf(Output, " %s %16ld %s\n",
+	 fprintf(Output, " %s %16llu %s\n",
 		 (*I).second.SHA1.c_str(),
 		 (*I).second.size,
 		 (*I).first.c_str());
@@ -1086,10 +1085,22 @@ void ReleaseWriter::Finish()
       for(map<string,struct CheckSum>::const_iterator I = CheckSums.begin();
 	  I != CheckSums.end(); ++I)
       {
-	 fprintf(Output, " %s %16ld %s\n",
+	 fprintf(Output, " %s %16llu %s\n",
 		 (*I).second.SHA256.c_str(),
 		 (*I).second.size,
 		 (*I).first.c_str());
       }
    }
+
+   fprintf(Output, "SHA512:\n");
+   for(map<string,struct CheckSum>::const_iterator I = CheckSums.begin();
+       I != CheckSums.end();
+       ++I)
+   {
+      fprintf(Output, " %s %16llu %s\n",
+              (*I).second.SHA512.c_str(),
+              (*I).second.size,
+              (*I).first.c_str());
+   }
+
 }
diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index ce0eab7af..76a3dfd1e 100644
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -22,7 +22,6 @@
 #include <set>
 
 #include "cachedb.h"
-#include "multicompress.h"
 #include "override.h"
 #include "apt-ftparchive.h"
 
@@ -31,7 +30,7 @@ using std::cout;
 using std::endl;
 using std::vector;
 using std::map;
-    
+
 class FTWScanner
 {
    protected:
@@ -48,7 +47,7 @@ class FTWScanner
    static int ScannerFile(const char *File, bool const &ReadLink);
 
    bool Delink(string &FileName,const char *OriginalPath,
-	       unsigned long &Bytes,off_t const &FileSize);
+	       unsigned long long &Bytes,unsigned long long const &FileSize);
 
    inline void NewLine(unsigned const &Priority)
    {
@@ -63,6 +62,7 @@ class FTWScanner
    bool DoMD5;
    bool DoSHA1;
    bool DoSHA256;
+   bool DoSHA512;
 
    unsigned long DeLinkLimit;
    string InternalPrefix;
@@ -80,6 +80,8 @@ class FTWScanner
    virtual ~FTWScanner() {};
 };
 
+class MultiCompress;
+
 class TranslationWriter
 {
    MultiCompress *Comp;
@@ -158,7 +160,7 @@ class SourcesWriter : public FTWScanner
    Override BOver;
    Override SOver;
    char *Buffer;
-   unsigned long BufSize;
+   unsigned long long BufSize;
    
    public:
 
@@ -195,8 +197,9 @@ protected:
       string MD5;
       string SHA1;
       string SHA256;
+      string SHA512;
       // Limited by FileFd::Size()
-      unsigned long size;
+      unsigned long long size;
       ~CheckSum() {};
    };
    map<string,struct CheckSum> CheckSums;
diff --git a/methods/bzip2.cc b/methods/bzip2.cc
deleted file mode 100644
index 42932dded..000000000
--- a/methods/bzip2.cc
+++ /dev/null
@@ -1,172 +0,0 @@
-// -*- mode: cpp; mode: fold -*-
-// Description								/*{{{*/
-/* ######################################################################
-
-   Bzip2 method - Take a file URI in and decompress it into the target 
-   file.
-
-   While the method is named "bzip2" it handles also other compression
-   types as it calls binaries based on the name of the method,
-   so it can also be used to handle gzip, lzma and others if named
-   correctly.
-
-   ##################################################################### */
-									/*}}}*/
-// Include Files							/*{{{*/
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/error.h>
-#include <apt-pkg/acquire-method.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/hashes.h>
-
-#include <sys/stat.h>
-#include <unistd.h>
-#include <utime.h>
-#include <stdio.h>
-#include <errno.h>
-#include <apti18n.h>
-									/*}}}*/
-
-const char *Prog;
-
-class Bzip2Method : public pkgAcqMethod
-{
-   virtual bool Fetch(FetchItem *Itm);
-   
-   public:
-   
-   Bzip2Method() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {};
-};
-
-
-// Bzip2Method::Fetch - Decompress the passed URI			/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool Bzip2Method::Fetch(FetchItem *Itm)
-{
-   URI Get = Itm->Uri;
-   string Path = Get.Host + Get.Path; // To account for relative paths
-   
-   string GzPathOption = "Dir::bin::"+string(Prog);
-
-   FetchResult Res;
-   Res.Filename = Itm->DestFile;
-   URIStart(Res);
-   
-   // Open the source and destination files
-   FileFd From(Path,FileFd::ReadOnly);
-
-   if(From.FileSize() == 0)
-      return _error->Error(_("Empty files can't be valid archives"));
-
-   int GzOut[2];   
-   if (pipe(GzOut) < 0)
-      return _error->Errno("pipe",_("Couldn't open pipe for %s"),Prog);
-
-   // Fork bzip2
-   pid_t Process = ExecFork();
-   if (Process == 0)
-   {
-      close(GzOut[0]);
-      dup2(From.Fd(),STDIN_FILENO);
-      dup2(GzOut[1],STDOUT_FILENO);
-      From.Close();
-      close(GzOut[1]);
-      SetCloseExec(STDIN_FILENO,false);
-      SetCloseExec(STDOUT_FILENO,false);
-      
-      const char *Args[3];
-      string Tmp = _config->Find(GzPathOption,Prog);
-      Args[0] = Tmp.c_str();
-      Args[1] = "-d";
-      Args[2] = 0;
-      execvp(Args[0],(char **)Args);
-      _exit(100);
-   }
-   From.Close();
-   close(GzOut[1]);
-   
-   FileFd FromGz(GzOut[0]);  // For autoclose   
-   FileFd To(Itm->DestFile,FileFd::WriteAtomic);   
-   To.EraseOnFailure();
-   if (_error->PendingError() == true)
-      return false;
-   
-   // Read data from bzip2, generate checksums and write
-   Hashes Hash;
-   bool Failed = false;
-   while (1) 
-   {
-      unsigned char Buffer[4*1024];
-      
-      ssize_t Count = read(GzOut[0],Buffer,sizeof(Buffer));
-      if (Count < 0 && errno == EINTR)
-	 continue;
-      
-      if (Count < 0)
-      {
-	 _error->Errno("read", _("Read error from %s process"),Prog);
-	 Failed = true;
-	 break;
-      }
-      
-      if (Count == 0)
-	 break;
-      
-      Hash.Add(Buffer,Count);
-      if (To.Write(Buffer,Count) == false)
-      {
-	 Failed = true;
-	 FromGz.Close();
-	 break;
-      }      
-   }
-   
-   // Wait for bzip2 to finish
-   if (ExecWait(Process,_config->Find(GzPathOption,Prog).c_str(),false) == false)
-   {
-      To.OpFail();
-      return false;
-   }  
-       
-   To.Close();
-   
-   if (Failed == true)
-      return false;
-   
-   // Transfer the modification times
-   struct stat Buf;
-   if (stat(Path.c_str(),&Buf) != 0)
-      return _error->Errno("stat",_("Failed to stat"));
-
-   struct utimbuf TimeBuf;
-   TimeBuf.actime = Buf.st_atime;
-   TimeBuf.modtime = Buf.st_mtime;
-   if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0)
-      return _error->Errno("utime",_("Failed to set modification time"));
-
-   if (stat(Itm->DestFile.c_str(),&Buf) != 0)
-      return _error->Errno("stat",_("Failed to stat"));
-   
-   // Return a Done response
-   Res.LastModified = Buf.st_mtime;
-   Res.Size = Buf.st_size;
-   Res.TakeHashes(Hash);
-
-   URIDone(Res);
-   
-   return true;
-}
-									/*}}}*/
-
-int main(int argc, char *argv[])
-{
-   setlocale(LC_ALL, "");
-
-   Bzip2Method Mth;
-
-   Prog = strrchr(argv[0],'/');
-   Prog++;
-   
-   return Mth.Run();
-}
diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index ae699dfc3..22d4b9164 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -8,12 +8,15 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/cdrom.h>
 #include <apt-pkg/cdromutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
 #include <apt-pkg/hashes.h>
 
 #include <sys/stat.h>
@@ -265,7 +268,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
 
    Hashes Hash;
    FileFd Fd(Res.Filename, FileFd::ReadOnly);
-   Hash.AddFD(Fd.Fd(), Fd.Size());
+   Hash.AddFD(Fd);
    Res.TakeHashes(Hash);
 
    URIDone(Res);
diff --git a/methods/connect.cc b/methods/connect.cc
index a5af1f1a6..9a092a43c 100644
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -11,9 +11,12 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include "connect.h"
+#include <config.h>
+
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/acquire-method.h>
 
 #include <stdio.h>
 #include <errno.h>
@@ -29,17 +32,18 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
+#include "connect.h"
 #include "rfc2553emu.h"
 #include <apti18n.h>
 									/*}}}*/
 
-static string LastHost;
+static std::string LastHost;
 static int LastPort = 0;
 static struct addrinfo *LastHostAddr = 0;
 static struct addrinfo *LastUsed = 0;
 
 // Set of IP/hostnames that we timed out before or couldn't resolve
-static std::set<string> bad_addr;
+static std::set<std::string> bad_addr;
 
 // RotateDNS - Select a new server from a DNS rotation			/*{{{*/
 // ---------------------------------------------------------------------
@@ -56,7 +60,7 @@ void RotateDNS()
 // DoConnect - Attempt a connect operation				/*{{{*/
 // ---------------------------------------------------------------------
 /* This helper function attempts a connection to a single address. */
-static bool DoConnect(struct addrinfo *Addr,string Host,
+static bool DoConnect(struct addrinfo *Addr,std::string Host,
 		      unsigned long TimeOut,int &Fd,pkgAcqMethod *Owner)
 {
    // Show a status indicator
@@ -71,7 +75,7 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
    Owner->Status(_("Connecting to %s (%s)"),Host.c_str(),Name);
 
    // if that addr did timeout before, we do not try it again
-   if(bad_addr.find(string(Name)) != bad_addr.end())
+   if(bad_addr.find(std::string(Name)) != bad_addr.end())
       return false;
 
    /* If this is an IP rotation store the IP we are using.. If something goes
@@ -98,7 +102,7 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
    /* This implements a timeout for connect by opening the connection
       nonblocking */
    if (WaitFd(Fd,true,TimeOut) == false) {
-      bad_addr.insert(bad_addr.begin(), string(Name));
+      bad_addr.insert(bad_addr.begin(), std::string(Name));
       Owner->SetFailReason("Timeout");
       return _error->Error(_("Could not connect to %s:%s (%s), "
 			   "connection timed out"),Host.c_str(),Service,Name);
@@ -117,7 +121,7 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
          Owner->SetFailReason("ConnectionRefused");
       else if (errno == ETIMEDOUT)
 	 Owner->SetFailReason("ConnectionTimedOut");
-      bad_addr.insert(bad_addr.begin(), string(Name));
+      bad_addr.insert(bad_addr.begin(), std::string(Name));
       return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(),
 			   Service,Name);
    }
@@ -128,7 +132,7 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
 // Connect - Connect to a server					/*{{{*/
 // ---------------------------------------------------------------------
 /* Performs a connection to the server */
-bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
+bool Connect(std::string Host,int Port,const char *Service,int DefPort,int &Fd,
 	     unsigned long TimeOut,pkgAcqMethod *Owner)
 {
    if (_error->PendingError() == true)
diff --git a/methods/connect.h b/methods/connect.h
index 6f208e31d..bbe1bb35d 100644
--- a/methods/connect.h
+++ b/methods/connect.h
@@ -11,9 +11,10 @@
 #define CONNECT_H
 
 #include <string>
-#include <apt-pkg/acquire-method.h>
 
-bool Connect(string To,int Port,const char *Service,int DefPort,
+class pkgAcqMethod;
+
+bool Connect(std::string To,int Port,const char *Service,int DefPort,
 	     int &Fd,unsigned long TimeOut,pkgAcqMethod *Owner);
 void RotateDNS();
 
diff --git a/methods/copy.cc b/methods/copy.cc
index a6bb372a3..e81d0022b 100644
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -9,7 +9,10 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
@@ -35,7 +38,7 @@ class CopyMethod : public pkgAcqMethod
 bool CopyMethod::Fetch(FetchItem *Itm)
 {
    URI Get = Itm->Uri;
-   string File = Get.Path;
+   std::string File = Get.Path;
 
    // Stat the file and send a start message
    struct stat Buf;
@@ -82,7 +85,7 @@ bool CopyMethod::Fetch(FetchItem *Itm)
    
    Hashes Hash;
    FileFd Fd(Res.Filename, FileFd::ReadOnly);
-   Hash.AddFD(Fd.Fd(), Fd.Size());
+   Hash.AddFD(Fd);
    Res.TakeHashes(Hash);
 
    URIDone(Res);
diff --git a/methods/file.cc b/methods/file.cc
index 9cdd5bc2d..7ed4e6f60 100644
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -13,10 +13,13 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
 
 #include <sys/stat.h>
 #include <unistd.h>
@@ -38,7 +41,7 @@ class FileMethod : public pkgAcqMethod
 bool FileMethod::Fetch(FetchItem *Itm)
 {
    URI Get = Itm->Uri;
-   string File = Get.Path;
+   std::string File = Get.Path;
    FetchResult Res;
    if (Get.Host.empty() == false)
       return _error->Error(_("Invalid URI, local URIS must not start with //"));
@@ -56,10 +59,10 @@ bool FileMethod::Fetch(FetchItem *Itm)
    }
    
    // See if we can compute a file without a .gz exentsion
-   string::size_type Pos = File.rfind(".gz");
+   std::string::size_type Pos = File.rfind(".gz");
    if (Pos + 3 == File.length())
    {
-      File = string(File,0,Pos);
+      File = std::string(File,0,Pos);
       if (stat(File.c_str(),&Buf) == 0)
       {
 	 FetchResult AltRes;
@@ -80,7 +83,7 @@ bool FileMethod::Fetch(FetchItem *Itm)
 
    Hashes Hash;
    FileFd Fd(Res.Filename, FileFd::ReadOnly);
-   Hash.AddFD(Fd.Fd(), Fd.Size());
+   Hash.AddFD(Fd);
    Res.TakeHashes(Hash);
    URIDone(Res);
    return true;
diff --git a/methods/ftp.cc b/methods/ftp.cc
index eb7fedd85..d55ac1224 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -15,11 +15,14 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
+#include <apt-pkg/configuration.h>
 
 #include <sys/stat.h>
 #include <sys/time.h>
@@ -30,7 +33,6 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <iostream>
-#include <apti18n.h>
 
 // Internet stuff
 #include <netinet/in.h>
@@ -41,6 +43,7 @@
 #include "rfc2553emu.h"
 #include "connect.h"
 #include "ftp.h"
+#include <apti18n.h>
 									/*}}}*/
 
 using namespace std;
@@ -74,6 +77,7 @@ FTPConn::FTPConn(URI Srv) : Len(0), ServerFd(-1), DataFd(-1),
 {
    Debug = _config->FindB("Debug::Acquire::Ftp",false);
    PasvAddr = 0;
+   Buffer[0] = '\0';
 }
 									/*}}}*/
 // FTPConn::~FTPConn - Destructor					/*{{{*/
@@ -618,8 +622,7 @@ bool FTPConn::ExtGoPasv()
    }
    
    // Get a new passive address.
-   int Res;
-   if ((Res = getaddrinfo(IP.c_str(),PStr,&Hints,&PasvAddr)) != 0)
+   if (getaddrinfo(IP.c_str(),PStr,&Hints,&PasvAddr) != 0)
       return true;
    
    return true;
@@ -628,7 +631,7 @@ bool FTPConn::ExtGoPasv()
 // FTPConn::Size - Return the size of a file				/*{{{*/
 // ---------------------------------------------------------------------
 /* Grab the file size from the server, 0 means no size or empty file */
-bool FTPConn::Size(const char *Path,unsigned long &Size)
+bool FTPConn::Size(const char *Path,unsigned long long &Size)
 {
    // Query the size
    unsigned int Tag;
@@ -638,7 +641,7 @@ bool FTPConn::Size(const char *Path,unsigned long &Size)
       return false;
    
    char *End;
-   Size = strtol(Msg.c_str(),&End,10);
+   Size = strtoull(Msg.c_str(),&End,10);
    if (Tag >= 400 || End == Msg.c_str())
       Size = 0;
    return true;
@@ -717,14 +720,13 @@ bool FTPConn::CreateDataFd()
    DataListenFd = -1;
 
    // Get the information for a listening socket.
-   struct addrinfo *BindAddr = 0;
+   struct addrinfo *BindAddr = NULL;
    struct addrinfo Hints;
    memset(&Hints,0,sizeof(Hints));
    Hints.ai_socktype = SOCK_STREAM;
    Hints.ai_flags |= AI_PASSIVE;
    Hints.ai_family = ((struct sockaddr *)&ServerAddr)->sa_family;
-   int Res;
-   if ((Res = getaddrinfo(0,"0",&Hints,&BindAddr)) != 0)
+   if (getaddrinfo(0,"0",&Hints,&BindAddr) != 0 || BindAddr == NULL)
       return _error->Error(_("getaddrinfo was unable to get a listening socket"));
    
    // Construct the socket
@@ -840,7 +842,7 @@ bool FTPConn::Finalize()
 // ---------------------------------------------------------------------
 /* This opens a data connection, sends REST and RETR and then
    transfers the file over. */
-bool FTPConn::Get(const char *Path,FileFd &To,unsigned long Resume,
+bool FTPConn::Get(const char *Path,FileFd &To,unsigned long long Resume,
 		  Hashes &Hash,bool &Missing)
 {
    Missing = false;
@@ -865,7 +867,7 @@ bool FTPConn::Get(const char *Path,FileFd &To,unsigned long Resume,
    
    if (Resume != 0)
    {
-      if (Hash.AddFD(To.Fd(),Resume) == false)
+      if (Hash.AddFD(To,Resume) == false)
       {
 	 _error->Errno("read",_("Problem hashing file"));
 	 return false;
@@ -1003,7 +1005,7 @@ bool FtpMethod::Fetch(FetchItem *Itm)
    
    // Get the files information
    Status(_("Query"));
-   unsigned long Size;
+   unsigned long long Size;
    if (Server->Size(File,Size) == false ||
        Server->ModTime(File,FailTime) == false)
    {
@@ -1025,7 +1027,7 @@ bool FtpMethod::Fetch(FetchItem *Itm)
    struct stat Buf;
    if (stat(Itm->DestFile.c_str(),&Buf) == 0)
    {
-      if (Size == (unsigned)Buf.st_size && FailTime == Buf.st_mtime)
+      if (Size == (unsigned long long)Buf.st_size && FailTime == Buf.st_mtime)
       {
 	 Res.Size = Buf.st_size;
 	 Res.LastModified = Buf.st_mtime;
@@ -1035,7 +1037,7 @@ bool FtpMethod::Fetch(FetchItem *Itm)
       }
       
       // Resume?
-      if (FailTime == Buf.st_mtime && Size > (unsigned)Buf.st_size)
+      if (FailTime == Buf.st_mtime && Size > (unsigned long long)Buf.st_size)
 	 Res.ResumePoint = Buf.st_size;
    }
    
diff --git a/methods/ftp.h b/methods/ftp.h
index d7f1f7fbe..2634f0732 100644
--- a/methods/ftp.h
+++ b/methods/ftp.h
@@ -10,6 +10,10 @@
 #ifndef APT_FTP_H
 #define APT_FTP_H
 
+#include <apt-pkg/strutl.h>
+
+#include <string>
+
 class FTPConn
 {
    char Buffer[1024*10];
@@ -33,7 +37,7 @@ class FTPConn
    socklen_t ServerAddrLen;
    
    // Private helper functions
-   bool ReadLine(string &Text);      
+   bool ReadLine(std::string &Text);
    bool Login();
    bool CreateDataFd();
    bool Finalize();
@@ -43,8 +47,8 @@ class FTPConn
    bool Comp(URI Other) {return Other.Host == ServerName.Host && Other.Port == ServerName.Port && Other.User == ServerName.User && Other.Password == ServerName.Password; };
    
    // Raw connection IO
-   bool ReadResp(unsigned int &Ret,string &Text);
-   bool WriteMsg(unsigned int &Ret,string &Text,const char *Fmt,...);
+   bool ReadResp(unsigned int &Ret,std::string &Text);
+   bool WriteMsg(unsigned int &Ret,std::string &Text,const char *Fmt,...);
    
    // Connection control
    bool Open(pkgAcqMethod *Owner);
@@ -53,9 +57,9 @@ class FTPConn
    bool ExtGoPasv();
    
    // Query
-   bool Size(const char *Path,unsigned long &Size);
+   bool Size(const char *Path,unsigned long long &Size);
    bool ModTime(const char *Path, time_t &Time);
-   bool Get(const char *Path,FileFd &To,unsigned long Resume,
+   bool Get(const char *Path,FileFd &To,unsigned long long Resume,
 	    Hashes &MD5,bool &Missing);
    
    FTPConn(URI Srv);
@@ -65,11 +69,11 @@ class FTPConn
 class FtpMethod : public pkgAcqMethod
 {
    virtual bool Fetch(FetchItem *Itm);
-   virtual bool Configuration(string Message);
+   virtual bool Configuration(std::string Message);
    
    FTPConn *Server;
    
-   static string FailFile;
+   static std::string FailFile;
    static int FailFd;
    static time_t FailTime;
    static void SigTerm(int);
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 3ad3e8d84..25ba0d063 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -1,9 +1,11 @@
+#include <config.h>
+
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/indexcopy.h>
-#include <apti18n.h>
+#include <apt-pkg/configuration.h>
 
 #include <utime.h>
 #include <stdio.h>
@@ -12,9 +14,13 @@
 #include <sys/wait.h>
 #include <iostream>
 #include <sstream>
-
 #include <vector>
 
+#include <apti18n.h>
+
+using std::string;
+using std::vector;
+
 #define GNUPGPREFIX "[GNUPG:]"
 #define GNUPGBADSIG "[GNUPG:] BADSIG"
 #define GNUPGNOPUBKEY "[GNUPG:] NO_PUBKEY"
@@ -92,8 +98,16 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       // Read a line.  Sigh.
       while ((c = getc(pipein)) != EOF && c != '\n')
       {
-         if (bufferoff == buffersize)
-            buffer = (char *) realloc(buffer, buffersize *= 2);
+	 if (bufferoff == buffersize)
+	 {
+	    char* newBuffer = (char *) realloc(buffer, buffersize *= 2);
+	    if (newBuffer == NULL)
+	    {
+	       free(buffer);
+	       return "Couldn't allocate a buffer big enough for reading";
+	    }
+	    buffer = newBuffer;
+	 }
          *(buffer+bufferoff) = c;
          bufferoff++;
       }
diff --git a/methods/gzip.cc b/methods/gzip.cc
index fc4e1ecfd..48c8e9892 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -9,6 +9,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
@@ -23,6 +25,8 @@
 #include <apti18n.h>
 									/*}}}*/
 
+const char *Prog;
+
 class GzipMethod : public pkgAcqMethod
 {
    virtual bool Fetch(FetchItem *Itm);
@@ -39,14 +43,23 @@ class GzipMethod : public pkgAcqMethod
 bool GzipMethod::Fetch(FetchItem *Itm)
 {
    URI Get = Itm->Uri;
-   string Path = Get.Host + Get.Path; // To account for relative paths
+   std::string Path = Get.Host + Get.Path; // To account for relative paths
    
    FetchResult Res;
    Res.Filename = Itm->DestFile;
    URIStart(Res);
-   
+
+   std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors();
+   std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin();
+   for (; compressor != compressors.end(); ++compressor)
+      if (compressor->Name == Prog)
+	 break;
+   if (compressor == compressors.end())
+      return _error->Error("Extraction of file %s requires unknown compressor %s", Path.c_str(), Prog);
+
    // Open the source and destination files
-   FileFd From(Path,FileFd::ReadOnlyGzip);
+   FileFd From;
+   From.Open(Path, FileFd::ReadOnly, *compressor);
 
    if(From.FileSize() == 0)
       return _error->Error(_("Empty files can't be valid archives"));
@@ -62,7 +75,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
    while (1) 
    {
       unsigned char Buffer[4*1024];
-      unsigned long Count;
+      unsigned long long Count = 0;
       
       if (!From.Read(Buffer,sizeof(Buffer),&Count))
       {
@@ -115,6 +128,9 @@ int main(int argc, char *argv[])
 {
    setlocale(LC_ALL, "");
 
+   Prog = strrchr(argv[0],'/');
+   ++Prog;
+
    GzipMethod Mth;
    return Mth.Run();
 }
diff --git a/methods/http.cc b/methods/http.cc
index 65a0cbbb7..c62ca71d3 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -25,8 +25,11 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
+#include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
@@ -39,10 +42,9 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
+#include <climits>
 #include <iostream>
 #include <map>
-#include <apti18n.h>
-
 
 // Internet stuff
 #include <netdb.h>
@@ -51,6 +53,8 @@
 #include "connect.h"
 #include "rfc2553emu.h"
 #include "http.h"
+
+#include <apti18n.h>
 									/*}}}*/
 using namespace std;
 
@@ -63,15 +67,15 @@ bool AllowRedirect = false;
 bool Debug = false;
 URI Proxy;
 
-unsigned long CircleBuf::BwReadLimit=0;
-unsigned long CircleBuf::BwTickReadData=0;
+unsigned long long CircleBuf::BwReadLimit=0;
+unsigned long long CircleBuf::BwTickReadData=0;
 struct timeval CircleBuf::BwReadTick={0,0};
 const unsigned int CircleBuf::BW_HZ=10;
  
 // CircleBuf::CircleBuf - Circular input buffer				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-CircleBuf::CircleBuf(unsigned long Size) : Size(Size), Hash(0)
+CircleBuf::CircleBuf(unsigned long long Size) : Size(Size), Hash(0)
 {
    Buf = new unsigned char[Size];
    Reset();
@@ -87,7 +91,7 @@ void CircleBuf::Reset()
    InP = 0;
    OutP = 0;
    StrPos = 0;
-   MaxGet = (unsigned int)-1;
+   MaxGet = (unsigned long long)-1;
    OutQueue = string();
    if (Hash != 0)
    {
@@ -102,7 +106,7 @@ void CircleBuf::Reset()
    is non-blocking.. */
 bool CircleBuf::Read(int Fd)
 {
-   unsigned long BwReadMax;
+   unsigned long long BwReadMax;
 
    while (1)
    {
@@ -117,7 +121,7 @@ bool CircleBuf::Read(int Fd)
 	 struct timeval now;
 	 gettimeofday(&now,0);
 
-	 unsigned long d = (now.tv_sec-CircleBuf::BwReadTick.tv_sec)*1000000 +
+	 unsigned long long d = (now.tv_sec-CircleBuf::BwReadTick.tv_sec)*1000000 +
 	    now.tv_usec-CircleBuf::BwReadTick.tv_usec;
 	 if(d > 1000000/BW_HZ) {
 	    CircleBuf::BwReadTick = now;
@@ -131,7 +135,7 @@ bool CircleBuf::Read(int Fd)
       }
 
       // Write the buffer segment
-      int Res;
+      ssize_t Res;
       if(CircleBuf::BwReadLimit) {
 	 Res = read(Fd,Buf + (InP%Size), 
 		    BwReadMax > LeftRead() ? LeftRead() : BwReadMax);
@@ -180,7 +184,7 @@ void CircleBuf::FillOut()
 	 return;
       
       // Write the buffer segment
-      unsigned long Sz = LeftRead();
+      unsigned long long Sz = LeftRead();
       if (OutQueue.length() - StrPos < Sz)
 	 Sz = OutQueue.length() - StrPos;
       memcpy(Buf + (InP%Size),OutQueue.c_str() + StrPos,Sz);
@@ -214,7 +218,7 @@ bool CircleBuf::Write(int Fd)
 	 return true;
       
       // Write the buffer segment
-      int Res;
+      ssize_t Res;
       Res = write(Fd,Buf + (OutP%Size),LeftWrite());
 
       if (Res == 0)
@@ -240,7 +244,7 @@ bool CircleBuf::Write(int Fd)
 bool CircleBuf::WriteTillEl(string &Data,bool Single)
 {
    // We cheat and assume it is unneeded to have more than one buffer load
-   for (unsigned long I = OutP; I < InP; I++)
+   for (unsigned long long I = OutP; I < InP; I++)
    {      
       if (Buf[I%Size] != '\n')
 	 continue;
@@ -258,7 +262,7 @@ bool CircleBuf::WriteTillEl(string &Data,bool Single)
       Data = "";
       while (OutP < I)
       {
-	 unsigned long Sz = LeftWrite();
+	 unsigned long long Sz = LeftWrite();
 	 if (Sz == 0)
 	    return false;
 	 if (I - OutP < Sz)
@@ -286,6 +290,11 @@ void CircleBuf::Stats()
    clog << "Got " << InP << " in " << Diff << " at " << InP/Diff << endl;*/
 }
 									/*}}}*/
+CircleBuf::~CircleBuf()
+{
+   delete [] Buf;
+   delete Hash;
+}
 
 // ServerState::ServerState - Constructor				/*{{{*/
 // ---------------------------------------------------------------------
@@ -453,7 +462,7 @@ bool ServerState::RunData()
 	    return false;
 	 	 
 	 // See if we are done
-	 unsigned long Len = strtol(Data.c_str(),0,16);
+	 unsigned long long Len = strtoull(Data.c_str(),0,16);
 	 if (Len == 0)
 	 {
 	    In.Limit(-1);
@@ -526,10 +535,6 @@ bool ServerState::HeaderLine(string Line)
    if (Line.empty() == true)
       return true;
 
-   // The http server might be trying to do something evil.
-   if (Line.length() >= MAXLEN)
-      return _error->Error(_("Got a single header line over %u chars"),MAXLEN);
-
    string::size_type Pos = Line.find(' ');
    if (Pos == string::npos || Pos+1 > Line.length())
    {
@@ -553,7 +558,7 @@ bool ServerState::HeaderLine(string Line)
       // Evil servers return no version
       if (Line[4] == '/')
       {
-	 int const elements = sscanf(Line.c_str(),"HTTP/%u.%u %u%[^\n]",&Major,&Minor,&Result,Code);
+	 int const elements = sscanf(Line.c_str(),"HTTP/%3u.%3u %3u%359[^\n]",&Major,&Minor,&Result,Code);
 	 if (elements == 3)
 	 {
 	    Code[0] = '\0';
@@ -567,7 +572,7 @@ bool ServerState::HeaderLine(string Line)
       {
 	 Major = 0;
 	 Minor = 9;
-	 if (sscanf(Line.c_str(),"HTTP %u%[^\n]",&Result,Code) != 2)
+	 if (sscanf(Line.c_str(),"HTTP %3u%359[^\n]",&Result,Code) != 2)
 	    return _error->Error(_("The HTTP server sent an invalid reply header"));
       }
 
@@ -577,7 +582,7 @@ bool ServerState::HeaderLine(string Line)
 	 Persistent = false;
       else
       {
-	 if (Major == 1 && Minor <= 0)
+	 if (Major == 1 && Minor == 0)
 	    Persistent = false;
 	 else
 	    Persistent = true;
@@ -595,9 +600,10 @@ bool ServerState::HeaderLine(string Line)
       // The length is already set from the Content-Range header
       if (StartPos != 0)
 	 return true;
-      
-      if (sscanf(Val.c_str(),"%lu",&Size) != 1)
-	 return _error->Error(_("The HTTP server sent an invalid Content-Length header"));
+
+      Size = strtoull(Val.c_str(), NULL, 10);
+      if (Size == ULLONG_MAX)
+	 return _error->Errno("HeaderLine", _("The HTTP server sent an invalid Content-Length header"));
       return true;
    }
 
@@ -611,9 +617,9 @@ bool ServerState::HeaderLine(string Line)
    {
       HaveContent = true;
       
-      if (sscanf(Val.c_str(),"bytes %lu-%*u/%lu",&StartPos,&Size) != 2)
+      if (sscanf(Val.c_str(),"bytes %llu-%*u/%llu",&StartPos,&Size) != 2)
 	 return _error->Error(_("The HTTP server sent an invalid Content-Range header"));
-      if ((unsigned)StartPos > Size)
+      if ((unsigned long long)StartPos > Size)
 	 return _error->Error(_("This HTTP server has broken range support"));
       return true;
    }
@@ -708,7 +714,19 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
       }
    }
 
-   
+   // If we ask for uncompressed files servers might respond with content-
+   // negotation which lets us end up with compressed files we do not support,
+   // see 657029, 657560 and co, so if we have no extension on the request
+   // ask for text only. As a sidenote: If there is nothing to negotate servers
+   // seem to be nice and ignore it.
+   if (_config->FindB("Acquire::http::SendAccept", true) == true)
+   {
+      size_t const filepos = Itm->Uri.find_last_of('/');
+      string const file = Itm->Uri.substr(filepos + 1);
+      if (flExtension(file) == file)
+	 strcat(Buf,"Accept: text/*\r\n");
+   }
+
    string Req = Buf;
 
    // Check for a partial file
@@ -716,7 +734,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
    if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
    {
       // In this case we send an if-range query with a range header
-      sprintf(Buf,"Range: bytes=%li-\r\nIf-Range: %s\r\n",(long)SBuf.st_size - 1,
+      sprintf(Buf,"Range: bytes=%lli-\r\nIf-Range: %s\r\n",(long long)SBuf.st_size - 1,
 	      TimeRFC1123(SBuf.st_mtime).c_str());
       Req += Buf;
    }
@@ -740,7 +758,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
           Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
    }
    Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent",
-		"Debian APT-HTTP/1.3 ("VERSION")") + "\r\n\r\n";
+		"Debian APT-HTTP/1.3 ("PACKAGE_VERSION")") + "\r\n\r\n";
    
    if (Debug == true)
       cerr << Req << endl;
@@ -999,31 +1017,21 @@ HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
    FailFile.c_str();   // Make sure we dont do a malloc in the signal handler
    FailFd = File->Fd();
    FailTime = Srv->Date;
-      
-   // Set the expected size
-   if (Srv->StartPos >= 0)
-   {
-      Res.ResumePoint = Srv->StartPos;
-      if (ftruncate(File->Fd(),Srv->StartPos) < 0)
-	 _error->Errno("ftruncate", _("Failed to truncate file"));
-   }
-      
-   // Set the start point
-   lseek(File->Fd(),0,SEEK_END);
 
    delete Srv->In.Hash;
    Srv->In.Hash = new Hashes;
-   
-   // Fill the Hash if the file is non-empty (resume)
-   if (Srv->StartPos > 0)
+
+   // Set the expected size and read file for the hashes
+   if (Srv->StartPos >= 0)
    {
-      lseek(File->Fd(),0,SEEK_SET);
-      if (Srv->In.Hash->AddFD(File->Fd(),Srv->StartPos) == false)
+      Res.ResumePoint = Srv->StartPos;
+      File->Truncate(Srv->StartPos);
+
+      if (Srv->In.Hash->AddFD(*File,Srv->StartPos) == false)
       {
 	 _error->Errno("read",_("Problem hashing file"));
 	 return ERROR_NOT_FROM_SERVER;
       }
-      lseek(File->Fd(),0,SEEK_END);
    }
    
    SetNonBlock(File->Fd(),true);
@@ -1319,7 +1327,7 @@ int HttpMethod::Loop()
                after the same URI is seen twice in a queue item. */
             StringVector &R = Redirected[Queue->DestFile];
             bool StopRedirects = false;
-            if (R.size() == 0)
+            if (R.empty() == true)
                R.push_back(Queue->Uri);
             else if (R[0] == "STOP" || R.size() > 10)
                StopRedirects = true;
diff --git a/methods/http.h b/methods/http.h
index 6302807c5..7a3ccda54 100644
--- a/methods/http.h
+++ b/methods/http.h
@@ -11,41 +11,42 @@
 #ifndef APT_HTTP_H
 #define APT_HTTP_H
 
-#define MAXLEN 360
+#include <apt-pkg/strutl.h>
 
-#include <apt-pkg/hashes.h>
+#include <string>
 
 using std::cout;
 using std::endl;
 
 class HttpMethod;
+class Hashes;
 
 class CircleBuf
 {
    unsigned char *Buf;
-   unsigned long Size;
-   unsigned long InP;
-   unsigned long OutP;
-   string OutQueue;
-   unsigned long StrPos;
-   unsigned long MaxGet;
+   unsigned long long Size;
+   unsigned long long InP;
+   unsigned long long OutP;
+   std::string OutQueue;
+   unsigned long long StrPos;
+   unsigned long long MaxGet;
    struct timeval Start;
    
-   static unsigned long BwReadLimit;
-   static unsigned long BwTickReadData;
+   static unsigned long long BwReadLimit;
+   static unsigned long long BwTickReadData;
    static struct timeval BwReadTick;
    static const unsigned int BW_HZ;
 
-   unsigned long LeftRead() const
+   unsigned long long LeftRead() const
    {
-      unsigned long Sz = Size - (InP - OutP);
+      unsigned long long Sz = Size - (InP - OutP);
       if (Sz > Size - (InP%Size))
 	 Sz = Size - (InP%Size);
       return Sz;
    }
-   unsigned long LeftWrite() const
+   unsigned long long LeftWrite() const
    {
-      unsigned long Sz = InP - OutP;
+      unsigned long long Sz = InP - OutP;
       if (InP > MaxGet)
 	 Sz = MaxGet - OutP;
       if (Sz > Size - (OutP%Size))
@@ -60,14 +61,14 @@ class CircleBuf
    
    // Read data in
    bool Read(int Fd);
-   bool Read(string Data);
+   bool Read(std::string Data);
    
    // Write data out
    bool Write(int Fd);
-   bool WriteTillEl(string &Data,bool Single = false);
+   bool WriteTillEl(std::string &Data,bool Single = false);
    
    // Control the write limit
-   void Limit(long Max) {if (Max == -1) MaxGet = 0-1; else MaxGet = OutP + Max;}   
+   void Limit(long long Max) {if (Max == -1) MaxGet = 0-1; else MaxGet = OutP + Max;}   
    bool IsLimit() const {return MaxGet == OutP;};
    void Print() const {cout << MaxGet << ',' << OutP << endl;};
 
@@ -79,8 +80,8 @@ class CircleBuf
    void Reset();
    void Stats();
 
-   CircleBuf(unsigned long Size);
-   ~CircleBuf() {delete [] Buf; delete Hash;};
+   CircleBuf(unsigned long long Size);
+   ~CircleBuf();
 };
 
 struct ServerState
@@ -89,17 +90,17 @@ struct ServerState
    unsigned int Major;
    unsigned int Minor;
    unsigned int Result;
-   char Code[MAXLEN];
+   char Code[360];
    
    // These are some statistics from the last parsed header lines
-   unsigned long Size;
-   signed long StartPos;
+   unsigned long long Size;
+   signed long long StartPos;
    time_t Date;
    bool HaveContent;
    enum {Chunked,Stream,Closes} Encoding;
    enum {Header, Data} State;
    bool Persistent;
-   string Location;
+   std::string Location;
    
    // This is a Persistent attribute of the server itself.
    bool Pipeline;
@@ -112,11 +113,12 @@ struct ServerState
    int ServerFd;
    URI ServerName;
   
-   bool HeaderLine(string Line);
+   bool HeaderLine(std::string Line);
    bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
-   void Reset() {Major = 0; Minor = 0; Result = 0; Size = 0; StartPos = 0;
-                 Encoding = Closes; time(&Date); ServerFd = -1; 
-                 Pipeline = true;};
+   void Reset() {Major = 0; Minor = 0; Result = 0; Code[0] = '\0'; Size = 0;
+		 StartPos = 0; Encoding = Closes; time(&Date); HaveContent = false;
+		 State = Header; Persistent = false; ServerFd = -1;
+		 Pipeline = true;};
 
    /** \brief Result of the header acquire */
    enum RunHeadersResult {
@@ -167,10 +169,10 @@ class HttpMethod : public pkgAcqMethod
    /** \brief Try to AutoDetect the proxy */
    bool AutoDetectProxy();
 
-   virtual bool Configuration(string Message);
+   virtual bool Configuration(std::string Message);
    
    // In the event of a fatal signal this file will be closed and timestamped.
-   static string FailFile;
+   static std::string FailFile;
    static int FailFd;
    static time_t FailTime;
    static void SigTerm(int);
@@ -178,8 +180,8 @@ class HttpMethod : public pkgAcqMethod
    protected:
    virtual bool Fetch(FetchItem *);
    
-   string NextURI;
-   string AutoDetectProxyCmd;
+   std::string NextURI;
+   std::string AutoDetectProxyCmd;
 
    public:
    friend struct ServerState;
diff --git a/methods/http_main.cc b/methods/http_main.cc
index 7815c2fc1..2ca91bfc9 100644
--- a/methods/http_main.cc
+++ b/methods/http_main.cc
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <signal.h>
diff --git a/methods/https.cc b/methods/https.cc
index fc649d6c2..fac7ba790 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -10,11 +10,14 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
+#include <apt-pkg/configuration.h>
 
 #include <sys/stat.h>
 #include <sys/time.h>
@@ -25,12 +28,11 @@
 #include <errno.h>
 #include <string.h>
 #include <iostream>
-#include <apti18n.h>
 #include <sstream>
 
 #include "config.h"
 #include "https.h"
-
+#include <apti18n.h>
 									/*}}}*/
 using namespace std;
 
@@ -51,7 +53,7 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow,
 {
    HttpsMethod *me = (HttpsMethod *)clientp;
    if(dltotal > 0 && me->Res.Size == 0) {
-      me->Res.Size = (unsigned long)dltotal;
+      me->Res.Size = (unsigned long long)dltotal;
       me->URIStart(me->Res);
    }
    return 0;
@@ -98,7 +100,6 @@ void HttpsMethod::SetupProxy()  					/*{{{*/
    depth. */
 bool HttpsMethod::Fetch(FetchItem *Itm)
 {
-   stringstream ss;
    struct stat SBuf;
    struct curl_slist *headers=NULL;  
    char curl_errorstr[CURL_ERROR_SIZE];
@@ -197,6 +198,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
       if (_config->FindB("Acquire::https::No-Store",
 		_config->FindB("Acquire::http::No-Store",false)) == true)
 	 headers = curl_slist_append(headers,"Cache-Control: no-store");
+      stringstream ss;
       ioprintf(ss, "Cache-Control: max-age=%u", _config->FindI("Acquire::https::Max-Age",
 		_config->FindI("Acquire::http::Max-Age",0)));
       headers = curl_slist_append(headers, ss.str().c_str());
@@ -217,7 +219,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    curl_easy_setopt(curl, CURLOPT_USERAGENT,
 	_config->Find("Acquire::https::User-Agent",
 		_config->Find("Acquire::http::User-Agent",
-			"Debian APT-CURL/1.0 ("VERSION")").c_str()).c_str());
+			"Debian APT-CURL/1.0 ("PACKAGE_VERSION")").c_str()).c_str());
 
    // set timeout
    int const timeout = _config->FindI("Acquire::https::Timeout",
@@ -240,15 +242,28 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    // error handling
    curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errorstr);
 
+   // If we ask for uncompressed files servers might respond with content-
+   // negotation which lets us end up with compressed files we do not support,
+   // see 657029, 657560 and co, so if we have no extension on the request
+   // ask for text only. As a sidenote: If there is nothing to negotate servers
+   // seem to be nice and ignore it.
+   if (_config->FindB("Acquire::https::SendAccept", _config->FindB("Acquire::http::SendAccept", true)) == true)
+   {
+      size_t const filepos = Itm->Uri.find_last_of('/');
+      string const file = Itm->Uri.substr(filepos + 1);
+      if (flExtension(file) == file)
+	 headers = curl_slist_append(headers, "Accept: text/*");
+   }
+
    // if we have the file send an if-range query with a range header
    if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
    {
       char Buf[1000];
-      sprintf(Buf,"Range: bytes=%li-\r\nIf-Range: %s\r\n",
-	      (long)SBuf.st_size - 1,
-	      TimeRFC1123(SBuf.st_mtime).c_str());
+      sprintf(Buf, "Range: bytes=%li-", (long) SBuf.st_size - 1);
+      headers = curl_slist_append(headers, Buf);
+      sprintf(Buf, "If-Range: %s", TimeRFC1123(SBuf.st_mtime).c_str());
       headers = curl_slist_append(headers, Buf);
-   } 
+   }
    else if(Itm->LastModified > 0)
    {
       curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
@@ -270,14 +285,17 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    long curl_servdate;
    curl_easy_getinfo(curl, CURLINFO_FILETIME, &curl_servdate);
 
+   File->Close();
+
    // cleanup
    if(success != 0) 
    {
       _error->Error("%s", curl_errorstr);
+      // unlink, no need keep 401/404 page content in partial/
+      unlink(File->Name().c_str());
       Fail();
       return true;
    }
-   File->Close();
 
    // Timestamp
    struct utimbuf UBuf;
@@ -309,7 +327,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    // take hashes
    Hashes Hash;
    FileFd Fd(Res.Filename, FileFd::ReadOnly);
-   Hash.AddFD(Fd.Fd(), Fd.Size());
+   Hash.AddFD(Fd);
    Res.TakeHashes(Hash);
    
    // keep apt updated
diff --git a/methods/https.h b/methods/https.h
index 3f0c416b6..b1961a870 100644
--- a/methods/https.h
+++ b/methods/https.h
@@ -8,10 +8,8 @@
    ##################################################################### */
 									/*}}}*/
 
-#ifndef APT_HTTP_H
-#define APT_HTTP_H
-
-#define MAXLEN 360
+#ifndef APT_HTTPS_H
+#define APT_HTTPS_H
 
 #include <iostream>
 #include <curl/curl.h>
@@ -20,7 +18,7 @@ using std::cout;
 using std::endl;
 
 class HttpsMethod;
-
+class FileFd;
 
 class HttpsMethod : public pkgAcqMethod
 {
@@ -45,6 +43,7 @@ class HttpsMethod : public pkgAcqMethod
    };
 };
 
+#include <apt-pkg/strutl.h>
 URI Proxy;
 
 #endif
diff --git a/methods/makefile b/methods/makefile
index 6ba51058e..a271aff5e 100644
--- a/methods/makefile
+++ b/methods/makefile
@@ -7,7 +7,7 @@ include ../buildlib/defaults.mak
 BIN := $(BIN)/methods
 
 include ../buildlib/libversion.mak
-APT_DOMAIN := libapt-pkg$(LIBAPTPKG_MAJOR)
+APT_DOMAIN := apt
 
 # The file method
 PROGRAM=file
@@ -67,7 +67,7 @@ include $(PROGRAM_H)
 
 # The rred method
 PROGRAM=rred
-SLIBS = -lapt-pkg -lz $(SOCKETLIBS) $(INTLLIBS)
+SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS)
 LIB_MAKES = apt-pkg/makefile
 SOURCE = rred.cc
 include $(PROGRAM_H)
@@ -86,16 +86,9 @@ LIB_MAKES = apt-pkg/makefile
 SOURCE = mirror.cc http.cc rfc2553emu.cc connect.cc
 include $(PROGRAM_H)
 
-# The gzip method
-PROGRAM=bzip2
-SLIBS = -lapt-pkg $(INTLLIBS)
-LIB_MAKES = apt-pkg/makefile
-SOURCE = bzip2.cc
-include $(PROGRAM_H)
-
-# SSH and lzma method symlink
-binary: $(BIN)/ssh $(BIN)/lzma $(BIN)/xz
-veryclean: clean-$(BIN)/ssh clean-$(BIN)/lzma clean-$(BIN)/xz
+# SSH method symlink
+binary: $(BIN)/ssh
+veryclean: clean-$(BIN)/ssh
 
 $(BIN)/ssh:
 	echo "Installing ssh method link"
@@ -103,14 +96,15 @@ $(BIN)/ssh:
 clean-$(BIN)/ssh:
 	-rm $(BIN)/ssh
 
-$(BIN)/lzma:
-	echo "Installing lzma method link"
-	ln -fs bzip2 $(BIN)/lzma
-clean-$(BIN)/lzma:
-	-rm $(BIN)/lzma
-
-$(BIN)/xz:
-	echo "Installing xz method link"
-	ln -fs bzip2 $(BIN)/xz
-clean-$(BIN)/xz:
-	-rm $(BIN)/xz
+# create links for all other compressors
+COMPRESSORS=bzip2 lzma xz
+
+binary: $(addprefix $(BIN)/,$(COMPRESSORS))
+veryclean: $(addprefix clean-$(BIN)/,$(COMPRESSORS))
+
+$(addprefix $(BIN)/,$(COMPRESSORS)): $(BIN)/gzip
+	echo "Installing $(notdir $@) method link"
+	ln -fs gzip $@
+
+$(addprefix clean-$(BIN)/,$(COMPRESSORS)):
+	-rm $(BIN)/$(notdir $@)
diff --git a/methods/mirror.cc b/methods/mirror.cc
index cb24a06cf..eb6d97425 100644
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -8,6 +8,9 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
+#include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/acquire-item.h>
@@ -15,7 +18,8 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/sourcelist.h>
-
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/metaindex.h>
 
 #include <algorithm>
 #include <fstream>
@@ -33,7 +37,7 @@ using namespace std;
 
 #include "mirror.h"
 #include "http.h"
-#include "apti18n.h"
+#include <apti18n.h>
 									/*}}}*/
 
 /* Done:
@@ -120,9 +124,10 @@ bool MirrorMethod::Clean(string Dir)
       if (I == list.end())
 	 unlink(Dir->d_name);
    };
-   
-   chdir(StartDir.c_str());
+
    closedir(D);
+   if (chdir(StartDir.c_str()) != 0)
+      return _error->Errno("chdir",_("Unable to change to %s"),StartDir.c_str());
    return true;   
 }
 
@@ -134,9 +139,24 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str)
    string fetch = BaseUri;
    fetch.replace(0,strlen("mirror://"),"http://");
 
+#if 0 // no need for this, the getArchitectures() will also include the main 
+      // arch
+   // append main architecture
+   fetch += "?arch=" + _config->Find("Apt::Architecture");
+#endif
+
+   // append all architectures
+   std::vector<std::string> vec = APT::Configuration::getArchitectures();
+   for (std::vector<std::string>::const_iterator I = vec.begin();
+        I != vec.end(); ++I)
+      if (I == vec.begin())
+         fetch += "?arch" + (*I);
+      else
+         fetch += "&arch=" + (*I);
+
    // append the dist as a query string
    if (Dist != "")
-      fetch += "?dist=" + Dist;
+      fetch += "&dist=" + Dist;
 
    if(Debug)
       clog << "MirrorMethod::DownloadMirrorFile(): '" << fetch << "'"
diff --git a/methods/mirror.h b/methods/mirror.h
index 97d18144a..81e531e21 100644
--- a/methods/mirror.h
+++ b/methods/mirror.h
@@ -11,8 +11,9 @@
 #ifndef APT_MIRROR_H
 #define APT_MIRROR_H
 
-
 #include <iostream>
+#include <string>
+#include <vector>
 
 using std::cout;
 using std::cerr;
@@ -24,29 +25,29 @@ class MirrorMethod : public HttpMethod
 {
    FetchResult Res;
    // we simply transform between BaseUri and Mirror
-   string BaseUri;    // the original mirror://... url
-   string Mirror;     // the selected mirror uri (http://...)
-   vector<string> AllMirrors; // all available mirrors
-   string MirrorFile; // the file that contains the list of mirrors
+   std::string BaseUri;    // the original mirror://... url
+   std::string Mirror;     // the selected mirror uri (http://...)
+   std::vector<std::string> AllMirrors; // all available mirrors
+   std::string MirrorFile; // the file that contains the list of mirrors
    bool DownloadedMirrorFile; // already downloaded this session
-   string Dist;       // the target distrubtion (e.g. sid, oneiric)
+   std::string Dist;       // the target distrubtion (e.g. sid, oneiric)
 
    bool Debug;
 
  protected:
-   bool DownloadMirrorFile(string uri);
-   bool RandomizeMirrorFile(string file);
-   string GetMirrorFileName(string uri);
+   bool DownloadMirrorFile(std::string uri);
+   bool RandomizeMirrorFile(std::string file);
+   std::string GetMirrorFileName(std::string uri);
    bool InitMirrors();
    bool TryNextMirror();
    void CurrentQueueUriToMirror();
-   bool Clean(string dir);
+   bool Clean(std::string dir);
    
    // we need to overwrite those to transform the url back
-   virtual void Fail(string Why, bool Transient = false);
+   virtual void Fail(std::string Why, bool Transient = false);
    virtual void URIStart(FetchResult &Res);
    virtual void URIDone(FetchResult &Res,FetchResult *Alt = 0);
-   virtual bool Configuration(string Message);
+   virtual bool Configuration(std::string Message);
 
  public:
    MirrorMethod();
diff --git a/methods/rfc2553emu.cc b/methods/rfc2553emu.cc
index 66bc906e9..f00e85889 100644
--- a/methods/rfc2553emu.cc
+++ b/methods/rfc2553emu.cc
@@ -14,12 +14,14 @@
 
    ##################################################################### */
 									/*}}}*/
-#include "rfc2553emu.h"
+#include <config.h>
+
 #include <stdlib.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <string.h>
 #include <stdio.h>
+#include "rfc2553emu.h"
 
 #ifndef HAVE_GETADDRINFO
 // getaddrinfo - Resolve a hostname					/*{{{*/
diff --git a/methods/rred.cc b/methods/rred.cc
index 6c55880ca..78d1595d4 100644
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -1,10 +1,13 @@
 // Includes									/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/mmap.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/hashes.h>
+#include <apt-pkg/configuration.h>
 
 #include <sys/stat.h>
 #include <sys/uio.h>
@@ -34,13 +37,10 @@ class RredMethod : public pkgAcqMethod {
 	// return values
 	enum State {ED_OK, ED_ORDERING, ED_PARSER, ED_FAILURE, MMAP_FAILED};
 
-	State applyFile(gzFile &ed_cmds, FILE *in_file, FILE *out_file,
+	State applyFile(FileFd &ed_cmds, FileFd &in_file, FileFd &out_file,
 	             unsigned long &line, char *buffer, Hashes *hash) const;
-	void ignoreLineInFile(FILE *fin, char *buffer) const;
-	void ignoreLineInFile(gzFile &fin, char *buffer) const;
-	void copyLinesFromFileToFile(FILE *fin, FILE *fout, unsigned int lines,
-	                            Hashes *hash, char *buffer) const;
-	void copyLinesFromFileToFile(gzFile &fin, FILE *fout, unsigned int lines,
+	void ignoreLineInFile(FileFd &fin, char *buffer) const;
+	void copyLinesFromFileToFile(FileFd &fin, FileFd &fout, unsigned int lines,
 	                            Hashes *hash, char *buffer) const;
 
 	State patchFile(FileFd &Patch, FileFd &From, FileFd &out_file, Hashes *hash) const;
@@ -69,10 +69,10 @@ public:
  *  \param hash the created file for correctness
  *  \return the success State of the ed command executor
  */
-RredMethod::State RredMethod::applyFile(gzFile &ed_cmds, FILE *in_file, FILE *out_file,
+RredMethod::State RredMethod::applyFile(FileFd &ed_cmds, FileFd &in_file, FileFd &out_file,
 			unsigned long &line, char *buffer, Hashes *hash) const {
 	// get the current command and parse it
-	if (gzgets(ed_cmds, buffer, BUF_SIZE) == NULL) {
+	if (ed_cmds.ReadLine(buffer, BUF_SIZE) == NULL) {
 		if (Debug == true)
 			std::clog << "rred: encounter end of file - we can start patching now." << std::endl;
 		line = 0;
@@ -127,7 +127,7 @@ RredMethod::State RredMethod::applyFile(gzFile &ed_cmds, FILE *in_file, FILE *ou
 	unsigned char mode = *idx;
 
 	// save the current position
-	unsigned const long pos = gztell(ed_cmds);
+	unsigned const long long pos = ed_cmds.Tell();
 
 	// if this is add or change then go to the next full stop
 	unsigned int data_length = 0;
@@ -161,7 +161,7 @@ RredMethod::State RredMethod::applyFile(gzFile &ed_cmds, FILE *in_file, FILE *ou
 
 	// include data from ed script
 	if (mode == MODE_CHANGED || mode == MODE_ADDED) {
-		gzseek(ed_cmds, pos, SEEK_SET);
+		ed_cmds.Seek(pos);
 		copyLinesFromFileToFile(ed_cmds, out_file, data_length, hash, buffer);
 	}
 
@@ -175,44 +175,24 @@ RredMethod::State RredMethod::applyFile(gzFile &ed_cmds, FILE *in_file, FILE *ou
 	return ED_OK;
 }
 										/*}}}*/
-void RredMethod::copyLinesFromFileToFile(FILE *fin, FILE *fout, unsigned int lines,/*{{{*/
+void RredMethod::copyLinesFromFileToFile(FileFd &fin, FileFd &fout, unsigned int lines,/*{{{*/
 					Hashes *hash, char *buffer) const {
 	while (0 < lines--) {
 		do {
-			fgets(buffer, BUF_SIZE, fin);
-			size_t const written = fwrite(buffer, 1, strlen(buffer), fout);
-			hash->Add((unsigned char*)buffer, written);
+			fin.ReadLine(buffer, BUF_SIZE);
+			unsigned long long const towrite = strlen(buffer);
+			fout.Write(buffer, towrite);
+			hash->Add((unsigned char*)buffer, towrite);
 		} while (strlen(buffer) == (BUF_SIZE - 1) &&
 		       buffer[BUF_SIZE - 2] != '\n');
 	}
 }
 										/*}}}*/
-void RredMethod::copyLinesFromFileToFile(gzFile &fin, FILE *fout, unsigned int lines,/*{{{*/
-					Hashes *hash, char *buffer) const {
-	while (0 < lines--) {
-		do {
-			gzgets(fin, buffer, BUF_SIZE);
-			size_t const written = fwrite(buffer, 1, strlen(buffer), fout);
-			hash->Add((unsigned char*)buffer, written);
-		} while (strlen(buffer) == (BUF_SIZE - 1) &&
-		       buffer[BUF_SIZE - 2] != '\n');
-	}
-}
-										/*}}}*/
-void RredMethod::ignoreLineInFile(FILE *fin, char *buffer) const {		/*{{{*/
-	fgets(buffer, BUF_SIZE, fin);
+void RredMethod::ignoreLineInFile(FileFd &fin, char *buffer) const {		/*{{{*/
+	fin.ReadLine(buffer, BUF_SIZE);
 	while (strlen(buffer) == (BUF_SIZE - 1) &&
 	       buffer[BUF_SIZE - 2] != '\n') {
-		fgets(buffer, BUF_SIZE, fin);
-		buffer[0] = ' ';
-	}
-}
-										/*}}}*/
-void RredMethod::ignoreLineInFile(gzFile &fin, char *buffer) const {		/*{{{*/
-	gzgets(fin, buffer, BUF_SIZE);
-	while (strlen(buffer) == (BUF_SIZE - 1) &&
-	       buffer[BUF_SIZE - 2] != '\n') {
-		gzgets(fin, buffer, BUF_SIZE);
+		fin.ReadLine(buffer, BUF_SIZE);
 		buffer[0] = ' ';
 	}
 }
@@ -220,21 +200,18 @@ void RredMethod::ignoreLineInFile(gzFile &fin, char *buffer) const {		/*{{{*/
 RredMethod::State RredMethod::patchFile(FileFd &Patch, FileFd &From,		/*{{{*/
 					FileFd &out_file, Hashes *hash) const {
    char buffer[BUF_SIZE];
-   FILE* fFrom = fdopen(From.Fd(), "r");
-   gzFile fPatch = Patch.gzFd();
-   FILE* fTo = fdopen(out_file.Fd(), "w");
 
    /* we do a tail recursion to read the commands in the right order */
    unsigned long line = -1; // assign highest possible value
-   State const result = applyFile(fPatch, fFrom, fTo, line, buffer, hash);
+   State const result = applyFile(Patch, From, out_file, line, buffer, hash);
    
    /* read the rest from infile */
    if (result == ED_OK) {
-      while (fgets(buffer, BUF_SIZE, fFrom) != NULL) {
-         size_t const written = fwrite(buffer, 1, strlen(buffer), fTo);
-         hash->Add((unsigned char*)buffer, written);
+      while (From.ReadLine(buffer, BUF_SIZE) != NULL) {
+	 unsigned long long const towrite = strlen(buffer);
+	 out_file.Write(buffer, towrite);
+	 hash->Add((unsigned char*)buffer, towrite);
       }
-      fflush(fTo);
    }
    return result;
 }
@@ -250,28 +227,32 @@ struct EdCommand {
   char type;
 };
 #define IOV_COUNT 1024 /* Don't really want IOV_MAX since it can be arbitrarily large */
+static ssize_t retry_writev(int fd, const struct iovec *iov, int iovcnt) {
+	ssize_t Res;
+	errno = 0;
+	ssize_t i = 0;
+	do {
+		Res = writev(fd, iov + i, iovcnt);
+		if (Res < 0 && errno == EINTR)
+			continue;
+		if (Res < 0)
+			return _error->Errno("writev",_("Write error"));
+		iovcnt -= Res;
+		i += Res;
+	} while (Res > 0 && iovcnt > 0);
+	return i;
+}
 #endif
 										/*}}}*/
 RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From,		/*{{{*/
 					FileFd &out_file, Hashes *hash) const {
 #ifdef _POSIX_MAPPED_FILES
-	MMap ed_cmds(MMap::ReadOnly);
-	if (Patch.gzFd() != NULL) {
-		unsigned long mapSize = Patch.Size();
-		DynamicMMap* dyn = new DynamicMMap(0, mapSize, 0);
-		if (dyn->validData() == false) {
-			delete dyn;
-			return MMAP_FAILED;
-		}
-		dyn->AddSize(mapSize);
-		gzread(Patch.gzFd(), dyn->Data(), mapSize);
-		ed_cmds = *dyn;
-	} else
-		ed_cmds = MMap(Patch, MMap::ReadOnly);
-
+	MMap ed_cmds(Patch, MMap::ReadOnly);
 	MMap in_file(From, MMap::ReadOnly);
 
-	if (ed_cmds.Size() == 0 || in_file.Size() == 0)
+	unsigned long long const ed_size = ed_cmds.Size();
+	unsigned long long const in_size = in_file.Size();
+	if (ed_size == 0 || in_size == 0)
 		return MMAP_FAILED;
 
 	EdCommand* commands = 0;
@@ -280,10 +261,10 @@ RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From,		/*{{{*/
 
 	const char* begin = (char*) ed_cmds.Data();
 	const char* end = begin;
-	const char* ed_end = (char*) ed_cmds.Data() + ed_cmds.Size();
+	const char* ed_end = (char*) ed_cmds.Data() + ed_size;
 
 	const char* input = (char*) in_file.Data();
-	const char* input_end = (char*) in_file.Data() + in_file.Size();
+	const char* input_end = (char*) in_file.Data() + in_size;
 
 	size_t i;
 
@@ -367,7 +348,12 @@ RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From,		/*{{{*/
 		}
 		if(command_count == command_alloc) {
 			command_alloc = (command_alloc + 64) * 3 / 2;
-			commands = (EdCommand*) realloc(commands, command_alloc * sizeof(EdCommand));
+			EdCommand* newCommands = (EdCommand*) realloc(commands, command_alloc * sizeof(EdCommand));
+			if (newCommands == NULL) {
+				free(commands);
+				return MMAP_FAILED;
+			}
+			commands = newCommands;
 		}
 		commands[command_count++] = cmd;
 	}
@@ -406,7 +392,7 @@ RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From,		/*{{{*/
 			hash->Add((const unsigned char*) begin, input - begin);
 
 			if(++iov_size == IOV_COUNT) {
-				writev(out_file.Fd(), iov, IOV_COUNT);
+				retry_writev(out_file.Fd(), iov, IOV_COUNT);
 				iov_size = 0;
 			}
 		}
@@ -431,7 +417,7 @@ RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From,		/*{{{*/
 				iov[iov_size].iov_len);
 
 				if(++iov_size == IOV_COUNT) {
-					writev(out_file.Fd(), iov, IOV_COUNT);
+					retry_writev(out_file.Fd(), iov, IOV_COUNT);
 					iov_size = 0;
 				}
 			}
@@ -446,15 +432,15 @@ RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From,		/*{{{*/
 	}
 
 	if(iov_size) {
-		writev(out_file.Fd(), iov, iov_size);
+		retry_writev(out_file.Fd(), iov, iov_size);
 		iov_size = 0;
 	}
 
 	for(i = 0; i < iov_size; i += IOV_COUNT) {
 		if(iov_size - i < IOV_COUNT)
-			writev(out_file.Fd(), iov + i, iov_size - i);
+			retry_writev(out_file.Fd(), iov + i, iov_size - i);
 		else
-			writev(out_file.Fd(), iov + i, IOV_COUNT);
+			retry_writev(out_file.Fd(), iov + i, IOV_COUNT);
 	}
 
 	delete [] iov;
@@ -470,7 +456,7 @@ bool RredMethod::Fetch(FetchItem *Itm)						/*{{{*/
 {
    Debug = _config->FindB("Debug::pkgAcquire::RRed", false);
    URI Get = Itm->Uri;
-   string Path = Get.Host + Get.Path; // To account for relative paths
+   std::string Path = Get.Host + Get.Path; // To account for relative paths
 
    FetchResult Res;
    Res.Filename = Itm->DestFile;
@@ -486,7 +472,7 @@ bool RredMethod::Fetch(FetchItem *Itm)						/*{{{*/
    // Open the source and destination files (the d'tor of FileFd will do 
    // the cleanup/closing of the fds)
    FileFd From(Path,FileFd::ReadOnly);
-   FileFd Patch(Path+".ed",FileFd::ReadOnlyGzip);
+   FileFd Patch(Path+".ed",FileFd::ReadOnly, FileFd::Gzip);
    FileFd To(Itm->DestFile,FileFd::WriteAtomic);   
    To.EraseOnFailure();
    if (_error->PendingError() == true)
@@ -523,7 +509,7 @@ bool RredMethod::Fetch(FetchItem *Itm)						/*{{{*/
       and use the access time from the "old" file */
    struct stat BufBase, BufPatch;
    if (stat(Path.c_str(),&BufBase) != 0 ||
-       stat(string(Path+".ed").c_str(),&BufPatch) != 0)
+       stat(std::string(Path+".ed").c_str(),&BufPatch) != 0)
       return _error->Errno("stat",_("Failed to stat"));
 
    struct utimbuf TimeBuf;
diff --git a/methods/rsh.cc b/methods/rsh.cc
index 21f0d0a22..fb3782314 100644
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -11,8 +11,12 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include "rsh.h"
+#include <config.h>
+
 #include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/configuration.h>
 
 #include <sys/stat.h>
 #include <sys/time.h>
@@ -22,6 +26,8 @@
 #include <stdio.h>
 #include <errno.h>
 #include <stdarg.h>
+#include "rsh.h"
+
 #include <apti18n.h>
 									/*}}}*/
 
@@ -29,14 +35,16 @@ const char *Prog;
 unsigned long TimeOut = 120;
 Configuration::Item const *RshOptions = 0;
 time_t RSHMethod::FailTime = 0;
-string RSHMethod::FailFile;
+std::string RSHMethod::FailFile;
 int RSHMethod::FailFd = -1;
 
 // RSHConn::RSHConn - Constructor					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
 RSHConn::RSHConn(URI Srv) : Len(0), WriteFd(-1), ReadFd(-1),
-                            ServerName(Srv), Process(-1) {}
+                            ServerName(Srv), Process(-1) {
+   Buffer[0] = '\0';
+}
 									/*}}}*/
 // RSHConn::RSHConn - Destructor					/*{{{*/
 // ---------------------------------------------------------------------
@@ -82,7 +90,7 @@ bool RSHConn::Open()
 // RSHConn::Connect - Fire up rsh and connect				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool RSHConn::Connect(string Host, string User)
+bool RSHConn::Connect(std::string Host, std::string User)
 {
    // Create the pipes
    int Pipes[4] = {-1,-1,-1,-1};
@@ -151,7 +159,7 @@ bool RSHConn::Connect(string Host, string User)
 // RSHConn::ReadLine - Very simple buffered read with timeout		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool RSHConn::ReadLine(string &Text)
+bool RSHConn::ReadLine(std::string &Text)
 {
    if (Process == -1 || ReadFd == -1)
       return false;
@@ -171,7 +179,7 @@ bool RSHConn::ReadLine(string &Text)
             continue;
 
          I++;
-         Text = string(Buffer,I);
+         Text = std::string(Buffer,I);
          memmove(Buffer,Buffer+I,Len - I);
          Len -= I;
          return true;
@@ -202,7 +210,7 @@ bool RSHConn::ReadLine(string &Text)
 // ---------------------------------------------------------------------
 /* The remote sync flag appends a || echo which will insert blank line
    once the command completes. */
-bool RSHConn::WriteMsg(string &Text,bool Sync,const char *Fmt,...)
+bool RSHConn::WriteMsg(std::string &Text,bool Sync,const char *Fmt,...)
 {
    va_list args;
    va_start(args,Fmt);
@@ -248,10 +256,10 @@ bool RSHConn::WriteMsg(string &Text,bool Sync,const char *Fmt,...)
 // ---------------------------------------------------------------------
 /* Right now for successfull transfer the file size must be known in 
    advance. */
-bool RSHConn::Size(const char *Path,unsigned long &Size)
+bool RSHConn::Size(const char *Path,unsigned long long &Size)
 {
    // Query the size
-   string Msg;
+	std::string Msg;
    Size = 0;
 
    if (WriteMsg(Msg,true,"find %s -follow -printf '%%s\\n'",Path) == false)
@@ -260,7 +268,7 @@ bool RSHConn::Size(const char *Path,unsigned long &Size)
    // FIXME: Sense if the bad reply is due to a File Not Found. 
    
    char *End;
-   Size = strtoul(Msg.c_str(),&End,10);
+   Size = strtoull(Msg.c_str(),&End,10);
    if (End == Msg.c_str())
       return _error->Error(_("File not found"));
    return true;
@@ -273,7 +281,7 @@ bool RSHConn::ModTime(const char *Path, time_t &Time)
 {
    Time = time(&Time);
    // Query the mod time
-   string Msg;
+   std::string Msg;
 
    if (WriteMsg(Msg,true,"TZ=UTC find %s -follow -printf '%%TY%%Tm%%Td%%TH%%TM%%TS\\n'",Path) == false)
       return false;
@@ -285,8 +293,8 @@ bool RSHConn::ModTime(const char *Path, time_t &Time)
 // RSHConn::Get - Get a file						/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool RSHConn::Get(const char *Path,FileFd &To,unsigned long Resume,
-                  Hashes &Hash,bool &Missing, unsigned long Size)
+bool RSHConn::Get(const char *Path,FileFd &To,unsigned long long Resume,
+                  Hashes &Hash,bool &Missing, unsigned long long Size)
 {
    Missing = false;
 
@@ -299,19 +307,19 @@ bool RSHConn::Get(const char *Path,FileFd &To,unsigned long Resume,
       return false;
 
    if (Resume != 0) {
-      if (Hash.AddFD(To.Fd(),Resume) == false) {
+      if (Hash.AddFD(To,Resume) == false) {
 	 _error->Errno("read",_("Problem hashing file"));
 	 return false;
       }
    }
    
    // FIXME: Detect file-not openable type errors.
-   string Jnk;
+   std::string Jnk;
    if (WriteMsg(Jnk,false,"dd if=%s bs=2048 skip=%u", Path, Resume / 2048) == false)
       return false;
 
    // Copy loop
-   unsigned int MyLen = Resume;
+   unsigned long long MyLen = Resume;
    unsigned char Buffer[4096];
    while (MyLen < Size)
    {
@@ -363,7 +371,7 @@ RSHMethod::RSHMethod() : pkgAcqMethod("1.0",SendConfig)
 									/*}}}*/
 // RSHMethod::Configuration - Handle a configuration message		/*{{{*/
 // ---------------------------------------------------------------------
-bool RSHMethod::Configuration(string Message)
+bool RSHMethod::Configuration(std::string Message)
 {
    char ProgStr[100];
   
@@ -425,7 +433,7 @@ bool RSHMethod::Fetch(FetchItem *Itm)
    Status(_("Connecting to %s"), Get.Host.c_str());
 
    // Get the files information
-   unsigned long Size;
+   unsigned long long Size;
    if (Server->Size(File,Size) == false ||
        Server->ModTime(File,FailTime) == false)
    {
@@ -446,7 +454,7 @@ bool RSHMethod::Fetch(FetchItem *Itm)
    // See if the file exists
    struct stat Buf;
    if (stat(Itm->DestFile.c_str(),&Buf) == 0) {
-      if (Size == (unsigned)Buf.st_size && FailTime == Buf.st_mtime) {
+      if (Size == (unsigned long long)Buf.st_size && FailTime == Buf.st_mtime) {
 	 Res.Size = Buf.st_size;
 	 Res.LastModified = Buf.st_mtime;
 	 Res.ResumePoint = Buf.st_size;
@@ -455,7 +463,7 @@ bool RSHMethod::Fetch(FetchItem *Itm)
       }
 
       // Resume?
-      if (FailTime == Buf.st_mtime && Size > (unsigned)Buf.st_size)
+      if (FailTime == Buf.st_mtime && Size > (unsigned long long)Buf.st_size)
 	 Res.ResumePoint = Buf.st_size;
    }
 
diff --git a/methods/rsh.h b/methods/rsh.h
index 98ca6a88c..d7efa3f06 100644
--- a/methods/rsh.h
+++ b/methods/rsh.h
@@ -12,9 +12,9 @@
 
 #include <string>
 #include <apt-pkg/strutl.h>
-#include <apt-pkg/hashes.h>
-#include <apt-pkg/acquire-method.h>
-#include <apt-pkg/fileutl.h>
+
+class Hashes;
+class FileFd;
 
 class RSHConn
 {
@@ -25,15 +25,15 @@ class RSHConn
    URI ServerName;
 
    // Private helper functions
-   bool ReadLine(string &Text);
+   bool ReadLine(std::string &Text);
 
    public:
 
    pid_t Process;
 
    // Raw connection IO
-   bool WriteMsg(string &Text,bool Sync,const char *Fmt,...);
-   bool Connect(string Host, string User);
+   bool WriteMsg(std::string &Text,bool Sync,const char *Fmt,...);
+   bool Connect(std::string Host, std::string User);
    bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
 
    // Connection control
@@ -41,23 +41,25 @@ class RSHConn
    void Close();
 
    // Query
-   bool Size(const char *Path,unsigned long &Size);
+   bool Size(const char *Path,unsigned long long &Size);
    bool ModTime(const char *Path, time_t &Time);
-   bool Get(const char *Path,FileFd &To,unsigned long Resume,
-            Hashes &Hash,bool &Missing, unsigned long Size);
+   bool Get(const char *Path,FileFd &To,unsigned long long Resume,
+            Hashes &Hash,bool &Missing, unsigned long long Size);
 
    RSHConn(URI Srv);
    ~RSHConn();
 };
 
+#include <apt-pkg/acquire-method.h>
+
 class RSHMethod : public pkgAcqMethod
 {
    virtual bool Fetch(FetchItem *Itm);
-   virtual bool Configuration(string Message);
+   virtual bool Configuration(std::string Message);
 
    RSHConn *Server;
 
-   static string FailFile;
+   static std::string FailFile;
    static int FailFd;
    static time_t FailTime;
    static void SigTerm(int);
diff --git a/po/apt-all.pot b/po/apt-all.pot
index f3392d204..b952c4f7b 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-14 12:59+0200\n"
+"Project-Id-Version: apt 0.8.16~exp14\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+0200\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"
@@ -15,151 +15,151 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3235 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1682
+#: cmdline/apt-cache.cc:1686
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -196,28 +196,28 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr ""
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -233,12 +233,12 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -252,40 +252,40 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1164
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 ""
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -327,136 +327,136 @@ msgid ""
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr ""
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr ""
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr ""
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr ""
 
-#: 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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr ""
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr ""
 
-#: ftparchive/cachedb.cc:452
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr ""
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr ""
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr ""
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr ""
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr ""
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr ""
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr ""
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr ""
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr ""
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr ""
 
@@ -467,17 +467,17 @@ msgstr ""
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
 #, c-format
-msgid "Malformed override %s line %lu #1"
+msgid "Malformed override %s line %llu #1"
 msgstr ""
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
 #, c-format
-msgid "Malformed override %s line %lu #2"
+msgid "Malformed override %s line %llu #2"
 msgstr ""
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
 #, c-format
-msgid "Malformed override %s line %lu #3"
+msgid "Malformed override %s line %llu #3"
 msgstr ""
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -485,63 +485,51 @@ msgstr ""
 msgid "Failed to read the override file %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr ""
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr ""
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr ""
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr ""
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr ""
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr ""
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr ""
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr ""
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr ""
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr ""
@@ -550,133 +538,137 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr ""
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr ""
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr ""
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr ""
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr ""
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr ""
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr ""
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr ""
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr ""
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr ""
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr ""
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr ""
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr ""
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr ""
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr ""
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -684,177 +676,177 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr ""
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr ""
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2096 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:969
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr ""
 
-#: cmdline/apt-get.cc:972
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr ""
 
-#: cmdline/apt-get.cc:975
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:978
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr ""
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr ""
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr ""
 
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 
-#: cmdline/apt-get.cc:1016
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr ""
 
-#: cmdline/apt-get.cc:1034 cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 
-#: cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1149
 msgid "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:1140
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of 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:1145
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of 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:1152
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\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:1157
+#: cmdline/apt-get.cc:1173
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1172 cmdline/apt-get.cc:1175 cmdline/apt-get.cc:2514
-#: cmdline/apt-get.cc:2517
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1185
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr ""
 
-#: cmdline/apt-get.cc:1201 cmdline/apt-get.cc:1221
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:1203
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr ""
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -862,46 +854,46 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: cmdline/apt-get.cc:1211 cmdline/apt-get.cc:1230
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr ""
 
-#: cmdline/apt-get.cc:1226
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:2579 apt-pkg/algorithms.cc:1445
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1316
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr ""
 
-#: cmdline/apt-get.cc:1317 cmdline/apt-get.cc:2591
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
-#: cmdline/apt-get.cc:1327
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: cmdline/apt-get.cc:1333
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr ""
 
-#: cmdline/apt-get.cc:1361
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -911,35 +903,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1365
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1573
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1589
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: cmdline/apt-get.cc:1652
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -955,15 +947,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1759 cmdline/apt-get.cc:1929
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1763
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1770
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -972,7 +964,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -980,25 +972,25 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1776
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1795
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1894
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1898
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1914
+#: cmdline/apt-get.cc:1929
 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"
@@ -1006,80 +998,80 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1932
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:2049
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2106 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr ""
 
-#: cmdline/apt-get.cc:2125 methods/ftp.cc:708 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2130
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr ""
 
-#: cmdline/apt-get.cc:2197 cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2233 cmdline/apt-get.cc:2269
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:2320
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2376
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2416 cmdline/apt-get.cc:2728
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2433
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2438
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1087,141 +1079,141 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2491
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2548
 #, 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:2537
+#: cmdline/apt-get.cc:2557
 #, 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:2542
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2548
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2586
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2637
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2652
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2672
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2691
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2716
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2733
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2753
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2883
+#: cmdline/apt-get.cc:2903
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:2904
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2927
+#: cmdline/apt-get.cc:2947
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2966
+#: cmdline/apt-get.cc:2986
 #, 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:2972
+#: cmdline/apt-get.cc:2992
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
-#: cmdline/apt-get.cc:2995
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:3011
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:3016
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:3109 cmdline/apt-get.cc:3121
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr ""
 
-#: cmdline/apt-get.cc:3240
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:3281
+#: cmdline/apt-get.cc:3301
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1267,7 +1259,7 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:3444
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1275,33 +1267,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr ""
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr ""
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr ""
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr ""
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr ""
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr ""
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1309,46 +1301,62 @@ msgid ""
 "in the drive '%s' and press enter\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, c-format
 msgid "%s set on hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1370,11 +1378,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1422,196 +1430,198 @@ msgstr ""
 msgid "Merging available information"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr ""
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr ""
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr ""
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr ""
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr ""
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr ""
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr ""
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr ""
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr ""
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr ""
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr ""
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr ""
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr ""
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr ""
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, 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:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:454 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:353
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr ""
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1063
-#: apt-pkg/pkgcachegen.cc:1167 apt-pkg/pkgcachegen.cc:1173
-#: apt-pkg/pkgcachegen.cc:1335
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, 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
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1619,482 +1629,488 @@ msgid ""
 "package!"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 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
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 ""
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr ""
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr ""
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr ""
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:527
-#: methods/rred.cc:536
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr ""
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:533
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr ""
 
-#: methods/cdrom.cc:200
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr ""
 
-#: methods/cdrom.cc:209
+#: 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 ""
 
-#: methods/cdrom.cc:219
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr ""
 
-#: methods/cdrom.cc:246
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 
-#: methods/cdrom.cc:251
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr ""
 
-#: methods/cdrom.cc:259 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr ""
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:169
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr ""
 
-#: methods/ftp.cc:175
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr ""
 
-#: methods/ftp.cc:180
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr ""
 
-#: methods/ftp.cc:211 methods/ftp.cc:239
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 
-#: methods/ftp.cc:217
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:224
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:244
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 
-#: methods/ftp.cc:272
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:298
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:336 methods/ftp.cc:447 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr ""
 
-#: methods/ftp.cc:342
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr ""
 
-#: methods/ftp.cc:345 apt-pkg/contrib/fileutl.cc:831 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr ""
 
-#: methods/ftp.cc:352 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr ""
 
-#: methods/ftp.cc:369 methods/ftp.cc:381
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:453 apt-pkg/contrib/fileutl.cc:873 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr ""
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr ""
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:870 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr ""
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr ""
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr ""
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr ""
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr ""
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
-#: methods/connect.cc:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 
-#: methods/connect.cc:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr ""
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr ""
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr ""
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr ""
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr ""
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr ""
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr ""
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr ""
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr ""
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
+#: apt-pkg/contrib/mmap.cc:117
 #, c-format
-msgid "Couldn't make mmap of %lu bytes"
+msgid "Couldn't make mmap of %llu bytes"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2123,705 +2139,677 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1137
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:101 apt-pkg/contrib/cmndline.cc:109
-#: apt-pkg/contrib/cmndline.cc:117
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:122
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:197 apt-pkg/contrib/cmndline.cc:203
+#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:232
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:263
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:295
+#: apt-pkg/contrib/cmndline.cc:298
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:345
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:460 apt-pkg/acquire.cc:485 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:690
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:702
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:704
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:708
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:710
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:775 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:792
+#: apt-pkg/contrib/fileutl.cc:923
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:852
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1087
 #, c-format
-msgid "read, still have %lu to read but none left"
+msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:885
+#: apt-pkg/contrib/fileutl.cc:1152
 #, c-format
-msgid "write, still have %lu to write but couldn't"
+msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1021
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1024
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1419
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1040
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1053
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+msgid "The package cache file is corrupted, it is too small"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr ""
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr ""
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr ""
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr ""
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:645
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, 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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
 #, 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."
+msgid "Could not configure '%s'. "
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:501
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
-"Could not perform immediate configuration on already unpacked '%s'. Please "
-"see man 5 apt.conf under APT::Immediate-Configure for details."
+"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 ""
 
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1471 apt-pkg/algorithms.cc:1473
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:861
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:863
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr ""
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: apt-pkg/policy.cc:72
+#: apt-pkg/policy.cc:74
 #, 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:390
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/policy.cc:412
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/policy.cc:420
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:190
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
 #, c-format
-msgid "Error occurred while processing %s (NewPackage)"
+msgid "Error occurred while processing %s (%s%d)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:207
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:245
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:277
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:281
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:298 apt-pkg/pkgcachegen.cc:308
-#: apt-pkg/pkgcachegen.cc:316
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:312
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:345
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:360
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:389
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:403
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:517
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:975
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1080
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1281
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1847
-#: apt-pkg/acquire-item.cc:1990
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1387
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1438
+#: apt-pkg/acquire-item.cc:1450
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1476
+#: apt-pkg/acquire-item.cc:1488
 #, 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:1498
+#: apt-pkg/acquire-item.cc:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1531
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -2829,418 +2817,442 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1541 apt-pkg/acquire-item.cc:1546
+#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1638
+#: apt-pkg/acquire-item.cc:1650
 #, 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:1697
+#: apt-pkg/acquire-item.cc:1709
 #, 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:1752
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1839
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:129
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr ""
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:927
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:929
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr ""
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1087
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1118
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1344
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1349
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1363
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1370
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, 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:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, c-format
 msgid "Can not read mirror file '%s'"
 msgstr ""
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:506
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:511
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 749c905fd..a64f69e57 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt_po\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -19,153 +19,154 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "الحزمة %s النسخة %s لها معتمد غير مستوفى:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "أسماء الحزم الكلية :"
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 #, fuzzy
 msgid "Total package structures: "
 msgstr "أسماء الحزم الكلية :"
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr " الحزم العادية:"
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "الحزمة الوهمية تماماً:"
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr " الحزمة الوهمية المفردة:"
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr " الحزم الوهمية المختلطة:"
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr " مفقودة:"
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "مجموع النسخ الفريدة:"
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "مجموع النسخ الفريدة:"
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "مجموع المعتمدات:"
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "مجموع علاقات النسخ/الملفات:"
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "مجموع علاقات النسخ/الملفات:"
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "مجموع علاقات النسخ/الملفات:"
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "مجموع المساحة المحسوب حسابها:"
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "لم يُعثر على أية حزم"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "يجب أن تعطي صيغة واحدة بالضبط"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "ملفات الحزم:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "الحزم المُدبّسة:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(غير موجود)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr " مُثبّت:"
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  مرشّح: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(لاشيء)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr " جدول النسخ:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -202,29 +203,29 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 #, 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:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "الرجاء إدخال قرص في السواقة وضغط الزر enter"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "فشل تغيير اسم %s إلى %s"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "كرر هذه العملية لباقي الأقراص المدمجة في المجموعة."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr ""
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -240,12 +241,12 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s ليس حزمة DEB صالحة."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -259,40 +260,40 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "تعذرت الكتابة إلى %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "قائمة توسيعات الحزمة طويلة جداً"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "قائمة توسيعات المصدر طويلة جداً"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "خطأ في معالجة المحتويات %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -334,136 +335,136 @@ msgid ""
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "لم تُطابق أية تحديدات"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "قاعدة البيانات كانت فاسدة، فتم تغيير اسمها إلى %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "قاعدة البيانات قديمة، محاولة ترقية %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, 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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr ""
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr ""
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr ""
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: تعذرت قراءة الدليل %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr ""
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr ""
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr ""
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "فشل فتح %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** فشل ربط %s بـ%s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr ""
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - فشل تعيين الذاكرة"
 
@@ -474,17 +475,17 @@ msgstr "تعذر فتح %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
 #, c-format
-msgid "Malformed override %s line %lu #1"
+msgid "Malformed override %s line %llu #1"
 msgstr ""
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
 #, c-format
-msgid "Malformed override %s line %lu #2"
+msgid "Malformed override %s line %llu #2"
 msgstr ""
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
 #, c-format
-msgid "Malformed override %s line %lu #3"
+msgid "Malformed override %s line %llu #3"
 msgstr ""
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -492,63 +493,51 @@ msgstr ""
 msgid "Failed to read the override file %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr ""
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr ""
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr ""
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr ""
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "خطأ داخلي، تعذر إنشاء %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr ""
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr ""
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr ""
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr ""
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr ""
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "فشل تغيير اسم %s إلى %s"
@@ -557,75 +546,79 @@ msgstr "فشل تغيير اسم %s إلى %s"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr ""
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "إلا أن %s مثبت"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "إلا أنه سيتم تثبيت %s"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "إلا أنه غير قابل للتثبيت"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "إلا أنها حزمة وهمية"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "إلا أنها غير مثبتة"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "إلا أنه لن يتم تثبيتها"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " أو"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "سيتم تثبيت الحزم الجديدة التالية:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "سيتم إزالة الحزم التالية:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "سيتم الإبقاء على الحزم التالية:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "ستتم ترقية الحزم التالية:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "سيتم تثبيط الحزم التالية:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "سيتم تغيير الحزم المبقاة التالية:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (بسبب %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -633,59 +626,59 @@ msgstr ""
 "تحذير: ستتم إزالة الحزم الأساسية التالية.\n"
 "لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً،  "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu أعيد تثبيتها، "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu مثبطة، "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "الحزمة %s وهميّة وتوفّرها:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [مُثبّتة]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr ""
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "يجب اختيار واحدة بالتحديد لتثبيتها."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -693,177 +686,177 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "على أيّ فإن الحزم التالية تحلّ مكانها:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "الحزمة %s ليس لها مرشح تثبيت"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "لاحظ، تحديد %s بدلاً من %s\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "إعادة تثبيت  %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s هي النسخة الأحدث.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "إلا أنه سيتم تثبيت %s"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "تصحيح المعتمدات..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " فشل."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "لم يمكن تصحيح المعتمدات"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "لم يمكن تقليص مجموعة الترقية"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " تم"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح هذه."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "تحذير: تعذرت المصادقة على الحزم التالية!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "تم غض النظر عن تحذير المصادقة.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "تثبيت هذه الحزم دون التحقق منها [y/N]؟ "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "تعذرت المصادقة على بعض الحزم"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "هناك مشاكل وتم استخدام -y دون --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "خطأ داخلي، لم تنته عملية الترتيب"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "يا للغرابة.. لم تتطابق الأحجام، الرجاء مراسلة apt@packages.debian.org"
 
 #. 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of 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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "بحاجة إلى جلب %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:1154
+#: cmdline/apt-get.cc:1168
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "بعد الاستخراج %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:1159
+#: cmdline/apt-get.cc:1173
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n"
 
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "تعذر حساب المساحة الحرة في %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "ليس هناك مساحة كافية في %s."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "نعم، افعل ما أقوله!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -874,28 +867,28 @@ msgstr ""
 "كي تستمر اكتب العبارة '%s'\n"
 " ؟] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "إجهاض."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "هل تريد الاستمرار [Y/n]؟"
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "فشل إحضار %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "فشل تنزيل بعض الملفات"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "اكتمل التنزيل وفي وضع التنزيل فقط"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -903,19 +896,19 @@ msgstr ""
 "تعذر إحضار بعض الأرشيف، ربما يمكنك محاولة تنفيذ apt-get update أو إضافة --"
 "fix-missing؟"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "تعذر تصحيح الحزم المفقودة."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "إجهاض التثبيت."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -925,35 +918,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "لا يقبل الأمر update أية مُعطيات"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -969,16 +962,16 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "قد تساعد المعلومات التالية في حل المشكلة:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -988,7 +981,7 @@ msgid_plural ""
 msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:"
 msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -996,26 +989,26 @@ msgid_plural ""
 msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:"
 msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "قد ترغب بتشغيل 'apt-get -f install' لتصحيح هذه:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 "مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1023,80 +1016,80 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "حزم معطوبة"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "سيتم تثبيت الحزم الإضافيّة التالية:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "الحزم المقترحة:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "الحزم المستحسنة:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "إلا أنه سيتم تثبيت %s"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "حساب الترقية..."
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "فشل"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "تمّ"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "تعذر قَفْل دليل التنزيل"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
 
-#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "تعذر العثور على مصدر الحزمة %s"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1104,141 +1097,141 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "تخطي الملف '%s' المنزل مسبقاً\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "إحضار المصدر %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "فشل إحضار بعض الأرشيفات."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "أمر فك الحزمة '%s' فشل.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "أمر البناء '%s' فشل.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2951
+#: cmdline/apt-get.cc:2986
 #, 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:2957
+#: cmdline/apt-get.cc:2992
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "الاتصال بـ%s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "الوحدات المدعومة:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1284,7 +1277,7 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1292,33 +1285,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr ""
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "جلب:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "تجاهل"
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "خطأ"
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "جلب %sب في %s (%sب/ث)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [يعمل]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1329,46 +1322,62 @@ msgstr ""
 " '%s'\n"
 "في السوّاقة '%s' وضغط مفتاح الإدخال\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "إلا أنها غير مثبتة"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "إلا أنه سيتم تثبيت %s"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "إلا أنه سيتم تثبيت %s"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s هي النسخة الأحدث.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s هي النسخة الأحدث.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "إلا أنه سيتم تثبيت %s"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "فشل فتح %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1390,11 +1399,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "سجل حزمة مجهول!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1444,196 +1453,198 @@ msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها �
 msgid "Merging available information"
 msgstr "دمج المعلومات المتوفرة"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "فشل تنفيذ gzip"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "أرشيف فاسد"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "فشل تحقّق Checksum لملف Tar، الأرشيف فاسد"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "توقيع الأرشيف غير صالح"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, fuzzy, c-format
 msgid "Invalid archive member header %s"
 msgstr "توقيع الأرشيف غير صالح"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "الأرشيف قصير جداً"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "فشلت قراءة ترويسات الأرشيف"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr ""
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr ""
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr ""
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "خطأ داخلي في AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr ""
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "ملف تهيئة مُزدوج %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "فشلت كتابة الملف %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "فشل إغلاق الملف %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "المسار %s طويل جداً"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "فكّ تحزيم %s أكثر من مرّة"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr ""
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr ""
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "المسار طويل جداً"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, 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:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "تعذرت قراءة %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "تعذرت إزالة %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "تعذر إنشاء %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "قراءة قوائم الحزم"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "فشل تغيير دليل الإدارة إلى %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "خطأ داخلي أثناء الحصول على اسم الحزمة"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "قراءة سرد الملفات"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1641,113 +1652,114 @@ msgid ""
 "package!"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "فشلت قراءة ملف القائمة %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "خطأ داخلي أثناء الحصول على node"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 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
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 ""
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "تعذر التغيير إلى %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "خطأ داخلي، تعذر العثور على العضو %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "فشل العثور على ملف تحكّم صالح"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr ""
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, fuzzy, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "فشل إغلاق الملف %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr ""
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "فشيل تنفيذ stat"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "فشل تعيين وقت التعديل"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "تعذرت قراءة قاعدة بيانات القرص المدمج %s"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1755,56 +1767,56 @@ msgstr ""
 "الرجاء استخدام apt-cdrom لتعريف APT بهذا القرص المدمج. لا يمكن استخدام apt-"
 "get update لإضافة أقراص مدمجة جديدة."
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "القرص المدمج الخطأ"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "تعذر فكّ القرص المدمج من %s، إذ قد يكون لا يزال قيد الاستخدام."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "لم يُعثر على القرص."
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "لم يُعثر على الملف"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "تسجيل الدخول"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr ""
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr ""
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "رفض الخادم اتصالنا بالرد: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "فشل USER، ردّ الخادم: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "فشل PASS، ردّ الخادم: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -1812,318 +1824,323 @@ msgstr ""
 "تم تحديد خادم بروكسي ولكن دون نص تسجيل دخول برمجي،  Acquire::ftp::ProxyLogin "
 "فارغ."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "فشل أمر نص تسجيل الدخول البرمجي '%s'، ردّ الخادم: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "فشل TYPE، ردّ الخادم: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "انتهى وقت الاتصال"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "أغلق الخادم الاتصال"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "خطأ في القراءة"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr ""
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "خطأ في الكتابة"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "تعذر إرسال الأمر PORT"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "فشل EPRT، ردّ الخادم: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "تعذر قبول الاتصال"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "تعذر إحضار الملف، ردّ الخادم '%s'"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "فشل نقل البيانات، ردّ الخادم '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "استعلام"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr ""
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "الاتصال بـ%s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
-#: methods/connect.cc:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "تعذر تمهيد الاتصال بـ%s:%s (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "تعذر الاتصال بـ%s:%s (%s)، انتهى وقت الاتصال"
 
-#: methods/connect.cc:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "الاتصال بـ%s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr ""
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr ""
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "تعذر الاتصال بـ%s %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr ""
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "بانتظار الترويسات"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "سطر ترويسة سيء"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "أرسل خادم http ترويسة ردّ غير صالحة"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "أرسل خادم http ترويسة طول محتويات (ِContent-Length) غير صالحة"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "أرسل خادم http ترويسة مدى محتويات (ِContent-Range) غير صالحة"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "خادم http له دعم مدى معطوب"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "نسق تاريخ مجهول"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "فشل التحديد"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "انتهى وقت الاتصال"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "خطأ في الكتابة إلى ملف المُخرجات"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "خطأ في الكتابة إلى الملف"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "خطأ في الكتابة إلى الملف"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "خطأ في القراءة من الخادم"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "فشلت كتابة الملف %s"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "بيانات ترويسة سيئة"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "فشل الاتصال"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "خطأ داخلي"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr ""
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "تعذر التغيير إلى %s"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "تعذر فتح %s"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "تعذر إرسال الأمر PORT"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:311
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "فشلت كتابة الملف %s"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2152,93 +2169,93 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "تعذر العثور على التحديد %s"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "اختصار نوع مجهول: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "فتح ملف التهيئة %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... خطأ!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... تمّ"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "خيار سطر الأمر '%c' [من %s] مجهول."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "خيار سطر الأمر %s غير مفهوم"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "الخيار %s يتطلّب مُعطى."
@@ -2248,344 +2265,361 @@ msgstr "الخيار %s يتطلّب مُعطى."
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "الخيار '%s' طويل جداً"
 
-#: 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 ""
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "عمليّة غير صالحة %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "فشل إغلاق الملف %s"
 
-#: apt-pkg/contrib/fileutl.cc:841
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1087
 #, c-format
-msgid "read, still have %lu to read but none left"
+msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:874
+#: apt-pkg/contrib/fileutl.cc:1152
 #, c-format
-msgid "write, still have %lu to write but couldn't"
+msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "مشكلة في إغلاق الملف"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "مشكلة في إغلاق الملف"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "مشكلة في مزامنة الملف"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "مشكلة في إغلاق الملف"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "مشكلة في مزامنة الملف"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+msgid "The package cache file is corrupted, it is too small"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "يعتمد"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "يعتمد مسبقاً"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "يستحسن"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "يقترح"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "يعارض"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "يستبدل"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "يُلغي"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "مهم"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "مطلوب"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "قياسي"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "اختياري"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "إضافي"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr ""
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 #, fuzzy
 msgid "Reading state information"
 msgstr "دمج المعلومات المتوفرة"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "فشل فتح %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "فشلت كتابة الملف %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "فتح %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, 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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "فشل إغلاق الملف %s"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2593,266 +2627,221 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:501
-#, 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
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "تعذر قفل دليل القائمة"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "الرجاء إدخال القرص المُسمّى  '%s' في السوّاقة '%s' وضغط مفتاح الإدخال."
 
-#: apt-pkg/init.cc:147
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "نظام الحزم '%s' غير مدعوم"
 
-#: apt-pkg/init.cc:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr ""
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "تعذرت قراءة قائمة المصادر."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "حدث خطأ أثناء معالجة %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "حدث خطأ أثناء معالجة %s (UserPackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "حدث خطأ أثناء معالجة %s (UserPackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
+msgid "Error occurred while processing %s (%s%d)"
 msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)"
 
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "حدث خطأ أثناء معالجة %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "فشل إعادة التسمية ، %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum غير متطابقة"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum غير متطابقة"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -2860,130 +2849,130 @@ msgid ""
 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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, 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:1698
+#: apt-pkg/acquire-item.cc:1709
 #, 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:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "الحجم غير متطابق"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "لاحظ، تحديد %s بدلاً من %s\n"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "لاحظ، تحديد %s بدلاً من %s\n"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "جاري التعرف..."
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "فك تركيب القرص المدمج..."
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "فك تركيب القرص المدمج\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "بانتظار القرص...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "تركيب القرص...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "هذا الاسم غير صالح، حاول مجدداً.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -2992,293 +2981,344 @@ msgstr ""
 "هذا القرص مسمى: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "نسخ قوائم الحزم..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "كتابة لائحة المصادر الجديدة\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "فتح ملف التهيئة %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "MD5Sum غير متطابقة"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "إجهاض التثبيت."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "تم تثبيت %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "تهيئة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "إزالة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "تمت إزالة %s بالكامل"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "فشل إغلاق الملف %s"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "تحضير %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "فتح %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "التحضير لتهيئة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "تم تثبيت %s"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "التحضير لإزالة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "تم إزالة %s"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "التحضير لإزالة %s بالكامل"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "تمت إزالة %s بالكامل"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, 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:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "فشل إغلاق الملف %s"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr ""
 
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "حدث خطأ أثناء معالجة %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "حدث خطأ أثناء معالجة %s (UserPackage1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "حدث خطأ أثناء معالجة %s (UserPackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "حدث خطأ أثناء معالجة %s (UsePackage3)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "خطأ داخلي، تعذر العثور على العضو"
 
diff --git a/po/ast.po b/po/ast.po
index d283fb8d1..abf5ca8c4 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -3,8 +3,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -15,150 +15,151 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Virtaal 0.5.2\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "El paquete %s versión %s nun cumple una dependencia:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Total de nomes de paquetes: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Total de cadarmes de paquetes: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Paquetes normales: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Paquetes virtuales puros: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Paquetes virtuales cenciellos: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Paquetes virtuales amestaos: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Falten: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Versiones distintes en total: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Descripciones distintes en total: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Dependencies totales: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Rellaciones versión/ficheru en total: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Rellaciones descripción/ficheru en total: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Mapes de provisiones en total: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Cadenes globalizaes en total: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Espaciu de dependencies de versión en total: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Espaciu ociosu en total: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Informe del total d'espaciu: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "El ficheru de paquetes %s nun ta sincronizáu."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Nun s'alcontraron paquetes"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "Has de dar polo menos un patrón de gueta"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nun pue alcontrase'l paquete %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Ficheros de paquete:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Paquetes na chincheta:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(nun s'alcontró)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Instaláu: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Candidatu: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(dengún)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Chincheta de paquetes: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Tabla de versiones:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -234,28 +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:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 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:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Falló al montar '%s' a '%s'"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repite'l procesu colos demás CDs del conxuntu."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Argumentos non empareyaos"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -283,12 +284,12 @@ msgstr ""
 "  -c=? Llee esti ficheru de configuración\n"
 "  -o=? Conseña una opción de configuración arbitraria, p. ex.\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s nun ye un paquete DEB válidu."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -313,40 +314,40 @@ msgstr ""
 "-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nun se pue escribir en %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Nun se pue alcontrar la versión de debconf. ¿Ta instaláu debconf?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "La llista d'estensión de paquetes ye enforma llarga"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Error al procesar el direutoriu %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "La llista d'estensión de fontes ye enforma llarga"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Error al escribir la cabecera al ficheru de conteníos"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Error al procesar conteníos %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -427,26 +428,26 @@ msgstr ""
 "  -c=?  Lleer esti ficheru de configuración\n"
 "  -o=?  Afita una escoyeta de configuración propia"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Nun concasó denguna seleición"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Falten dellos ficheros nel grupu de ficheros de paquete `%s'"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "La BD corrompiose, ficheru renomáu como %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "La DB ye antigua, tentando actualizar %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -454,111 +455,111 @@ msgstr ""
 "El formatu de la base de datos nun ye válidu. Si anovaste dende una versión "
 "anterior d'apt, desanicia y recrea la base de datos."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Nun pudo abrise'l ficheru de BD %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Nun pudo lleese %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "L'archivu nun tien rexistru de control"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Nun pudo algamase un cursor"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A: Nun pudo lleese'l direutoriu %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "A: Nun pudo lleese %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "A: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: Errores aplicables al ficheru "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Nun pudo resolvese %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Falló'l percorríu pol árbol"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Nun pudo abrise %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " Desenllazar %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Nun pudo lleese l'enllaz %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Nun pudo desenllazase %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Falló enllazar enllazr %s a %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Alcanzose'l llímite of %sB de desenllaz.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "L'archivu nun tien el campu paquetes"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s nun tien la entrada saltos\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  el curiador de %s ye %s y non %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s nun tien la entrada saltos de fonte\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s tampoco nun tiene una entrada binaria de saltos\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Nun pudo allugase memoria"
 
@@ -568,18 +569,18 @@ msgid "Unable to open %s"
 msgstr "Nun pudo abrise %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Saltu mal formáu %s llinia %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Saltu mal formáu %s llinia %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Saltu mal formáu %s llinia %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -587,63 +588,51 @@ msgstr "Saltu mal formáu %s llinia %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "Nun pudo lleese'l ficheru de saltos %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Algoritmu de compresión desconocíu '%s'"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "La salida comprimida %s necesita un xuegu de compresión"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Falló criar un tubu IPC al soprocesu"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Nun pudo criase FICHERU*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Nun pudo biforcase"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Comprimir fíu"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Error internu, nun pudo criase %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Nun pudo criase'l soprocesu IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Nun pudo executase'l compresor "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "descompresor"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "Fallu na ES al soprocesu/ficheru"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Nun pudo lleese al computar MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Problema al desenllazar %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Nun pudo renomase %s como %s"
@@ -652,75 +641,79 @@ msgstr "Nun pudo renomase %s como %s"
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Error de compilación d'espresión regular - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Los siguientes paquetes nun cumplen dependencies:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "pero %s ta instaláu"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "pero %s ta pa instalar"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "pero nun ye instalable"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "pero ye un paquete virtual"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "pero nun ta instaláu"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "pero nun va instalase"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " o"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Van instalase los siguientes paquetes NUEVOS:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Los siguientes paquetes van DESANICIASE:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Los siguientes paquetes tan reteníos:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Los siguientes paquetes van actualizase:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Los siguientes paquetes van DESACTUALIZASE:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Van camudase los siguientes paquetes reteníos:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (por %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -728,59 +721,59 @@ msgstr ""
 "AVISU: Los siguientes paquetes esenciales van desaniciase.\n"
 "¡Esto NUN hai que facelo si nun sabes esautamente lo que faes!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu actualizaos, %lu nuevos instalaos, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalaos, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu desactualizaos, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu para desaniciar y %lu nun actualizaos.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Nota, escoyendo '%s' pa la xera '%s'\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Nota, escoyendo '%s' pa regex '%s'\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "El paquete %s ye un paquete virtual ufríu por:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Instaláu]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr " [Nun ye versión candidata]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Has d'escoyer esplícitamente unu pa instalar."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -791,177 +784,177 @@ msgstr ""
 "Esto puede significar que falta el paquete, ta arrumbáu, o sólo\n"
 "ta disponible dende otra fonte\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Sicasí, los siguientes paquetes reemplacenlu:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "El paquete '%s' nun tien candidatu pa instalación"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "Los paquetes virtuales como '%s' nun pueden desaniciase\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Nota, escoyendo %s nel llugar de %s\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Saltando %s, ya ta instalau y la actualización nun ta activada.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "Saltando %s, nun ta instaláu y namái se requieren anovamientos.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "La reinstalación de %s nun ye dable, nun pue descargase.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s yá ta na versión más nueva.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s axustáu como instaláu manualmente.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Esbillada la versión %s (%s) pa %s\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Esbillada la versión %s (%s) pa %s\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Iguando dependencies..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " falló."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Nun pudieron iguase les dependencies"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Nun pue amenorgase'l conxuntu d'actualización"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Fecho"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Habríes d'executar 'apt-get -f install' para igualo."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependencies incumplíes. Téntalo usando -f."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISU: ¡Nun pudieron autenticase los siguientes paquetes!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Avisu d'autenticación saltáu.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "¿Instalar esos paquetes ensin verificación [s/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Dellos paquetes nun pudieron autenticase"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Hai problemes y utilizose -y ensin --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Error internu, ¡InstallPackages llamose con paquetes frañaos!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torgáu."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error internu, ordenar nun finó"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "Que raro.. Los tamaños nun concasen, escribe a apt@packages.debian.org"
 
 #. 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Hai que descargar %sB/%sB d'archivos.\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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Hai que descargar %sB d'archivos.\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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Tres d'esta operación, van usase %sB d'espaciu de discu adicional.\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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 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:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nun pue determinase l'espaciu llibre de %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Nun tienes espaciu libre bastante en %s."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Conseñose Trivial Only pero ésta nun ye una operación trivial."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Sí, ¡facer lo que digo!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -972,28 +965,28 @@ msgstr ""
 "Pa continuar escribe la frase '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Encaboxar."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "¿Quies continuar [S/n]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falló algamar %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Dellos ficheros nun pudieron descargase"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Descarga completa y en mou de sólo descarga"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1001,19 +994,19 @@ msgstr ""
 "Nun pudieron algamase dellos archivos, ¿seique executando apt-get update o "
 "tentando --fix-missing?"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing y cambéu de mediu nun ta sofitao actualmente"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Nun pudieron iguase los paquetes que falten."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Encaboxando la instalación."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1027,35 +1020,35 @@ msgstr[1] ""
 "Los siguientes paquetes desaparecieron del sistema como\n"
 "tolos ficheros fueron sobroescritos por otros paquetes:"
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Nota: Esto faise automáticamente y baxo demanda por dpkg."
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Inorar release destín non disponible '%s' pal paquete '%s'"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Tomando '%s' como paquetes d'oríxenes en llugar de '%s'\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Inorar versión non disponible de '%s' del paquete '%s'"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "La orde update nun lleva argumentos"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Suponse que nun vamos esborrar coses; nun pue entamase AutoRemover"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1073,15 +1066,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "La siguiente información pue aidar a resolver la situación:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error internu, AutoRemover rompió coses"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1092,7 +1085,7 @@ msgstr[1] ""
 "Los siguientes paquetes instaláronse de manera automática y ya nun se "
 "necesiten:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1101,19 +1094,19 @@ msgstr[0] "El paquete %lu instalóse de mou automáticu y yá nun se necesita.\n
 msgstr[1] ""
 "Los paquetes %lu instaláronse de manera automática y ya nun se necesiten\n"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Usa 'apt-get autoremove' pa desinstalalos."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Error internu, AllUpgrade rompió coses"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Habríes d'executar 'apt-get -f install' para iguar estos:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1121,7 +1114,7 @@ msgstr ""
 "Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o "
 "conseña una solución)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1133,73 +1126,73 @@ msgstr ""
 "inestable, que dellos paquetes necesarios nun se crearon o que\n"
 "s'allugaron fuera d'Incoming."
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Paquetes frañaos"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Instalaránse los siguientes paquetes extra:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Paquetes afalaos:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Paquetes encamentaos"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nun pudo alcontrase'l paquete %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s axustáu como instaláu automáticamente.\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Calculando l'anovamientu... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Falló"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Fecho"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Error internu, l'iguador de problemes frañó coses"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Nun pue bloquiase'l direutoriu de descarga"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 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:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nun pudo alcontrase un paquete fonte pa %s"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1208,7 +1201,7 @@ msgstr ""
 "AVISU: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1220,87 +1213,87 @@ msgstr ""
 "pa baxar los caberos anovamientos (posiblemente tovía nun sacaos) pal "
 "paquete.\n"
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Saltando'l ficheru yá descargáu '%s'\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Hai falta descargar %sB d'archivos fonte.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fonte descargada %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Falló la descarga de dellos archivos."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Falló la orde de desempaquetáu '%s'.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, 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:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Falló la orde build '%s'.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Falló el procesu fíu"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 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:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, 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:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nun tien dependencies de construcción.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1309,7 +1302,7 @@ msgstr ""
 "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
 "paquete %s"
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1318,14 +1311,14 @@ msgstr ""
 "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
 "paquete %s"
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1334,7 +1327,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:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1343,30 +1336,30 @@ msgstr ""
 "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
 "paquete %s"
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, 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:2996
+#: cmdline/apt-get.cc:3031
 #, 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:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Fallu al procesar les dependencies de construcción"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Coneutando a %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Módulos sofitaos:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1457,7 +1450,7 @@ msgstr ""
 "pa más información y opciones.\n"
 "                       Esti APT tien Poderes de Super Vaca.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1470,33 +1463,33 @@ msgstr ""
 "       asina que nun dependen de la pertinencia de la verdadera situación "
 "actual!"
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Oxe "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Des:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ign "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Err "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Descargaos %sB en %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Tresnando]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1507,46 +1500,62 @@ msgstr ""
 " '%s'\n"
 "na unidá '%s' y calca Intro\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "pero nun ta instaláu"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s axustáu como instaláu manualmente.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s axustáu como instaláu automáticamente.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s yá ta na versión más nueva.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s yá ta na versión más nueva.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s axustáu como instaláu manualmente.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Nun pudo abrise %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1568,11 +1577,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "¡Rexistru de paquetes desconocíu!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1636,197 +1645,199 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Fusionando información disponible"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Fallu al crear les tuberíes"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Fallu al executar gzip "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Ficheru tollíu"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Falló la suma de control de tar, ficheru tollíu"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Testera  del TAR triba %u desconocida, miembru %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Robla del ficheru inválida"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Fallu al lleer la testera de miembru del ficheru"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "Testera de miembru del archivu %s inválida"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Testera de miembru del ficheru inválida"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "El ficheru ye perpequeñu"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Falló al lleer les testeres del ficheru"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "Llamóse a DropNode nun nodu que ta entá enllazáu"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "¡Fallu al atopar l'elementu enllazáu!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Falló al allugar una desvíu"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Fallu internu en AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Intentando sobrescribir un desvíu, %s -> %s and %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Doble suma de desvíu %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Ficheru de configuración duplicáu %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Falló la escritura nel ficheru %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Falló al pesllar el ficheru %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "La trayeutoria %s ye enforma llarga"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Desempaquetando %s más d'una vegada"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "El direutorio %s ta desviáu"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "La trayeutoria de desviación ye enforma llarga"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "Fallu al atopar el nodu nel so bote d'enllaz"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "La trayeutoria ye perllarga"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, 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:429
+#: apt-inst/extract.cc:432
 #, 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"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nun ye a lleer %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Nun ye a lleer %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Nun ye a desaniciar %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Nun ye a crear %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Nun ye a lleer %s"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "Los direutorios info y temp tienen de tar nel mesmu sistema de ficheros"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Lleendo llista de paquetes"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Fallu al camudar al direutoriu d'alministración %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Fallu internu al obtener un Nome de Paquete"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Lleendo llistáu de ficheros"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1837,113 +1848,114 @@ msgstr ""
 "esti ficheru entós crea ún baleru y darréu reinstala la mesma versión del "
 "paquete!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Fallu al lleer el ficheru de llista %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Fallu internu al obtener un nodu"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Fallu al abrir el ficheru de desviación %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "El ficheru de desviación ta tollíu"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Llinia inválida nel ficheru de desviación: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Fallu internu al amestar una desviación"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "El caché del paquete tien d'entamase primero"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Fallu al atopar un paquete: Testera, desplazamientu %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Estaya mala del ConfFile nel ficheru d'estñau. Desplazamientu %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Fallu al lleer Md5. Desplazamientu %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Esti nun ye un ficheru DEB válidu, falta'l miembru '%s'"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 "Esti nun ye un ficheru DEB válidu, falta'l miembru '%s', '%s' o '%s'"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Nun fui a camudar a %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Error internu, nun se pue atopar el miembru %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Nun fui a atopar un ficheru de control válidu"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Ficheru de control inanalizable"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Nun se pudo abrir una tubería pa %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Fallu de llectura dende'l procesu %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Falló al lleer"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Nun se pudo afitar la hora de modificación"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Nun se pudo lleer la base datos %s del CD-ROM"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1951,56 +1963,56 @@ msgstr ""
 "Por favor usa apt-cdrom pa facer qu'APT reconoza esti CD. apt-get update nun "
 "se puede usar p'amestar CDs nuevos"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "CD-ROM malu"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Nun se pudo desmontar el CD-ROM de %s; puede que se tea usando entá."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Nun s'atopa'l discu."
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Nun s'atopa'l ficheru."
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI malu, los URIS llocales nun pueden entamar por //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Entrando"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Nun se pudo determinar el nome del par"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Nun se pudo determinar el nome llocal"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "El sirvidor refugó la conexón, y dixo: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "L'usuariu (USER) falló; el sirvidor dixo: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "La contraseña (PASS) falló; el sirvidor dixo: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2008,197 +2020,197 @@ msgstr ""
 "Especificóse un sirvidor proxy pero non un script d'entrada, Acquire::ftp::"
 "ProxyLogin ta baleru."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Falló la orde '%s' del guión d'entrada; el sirvidor dixo: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "La triba (TYPE) falló; el sirvidor dixo: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Gandió'l tiempu de conexón"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "El sirvidor zarró la conexón"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Fallu de llectura"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Una rempuesta revirtió'l buffer."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Corrupción del protocolu"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Fallu d'escritura"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Nun se pudo crear un socket"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "Nun se pudo coneutar el zócalu de datos; gandió'l tiempu de conexón"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Nun se pudo coneutar un socket pasivu."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo nun pudo obtener un zócalu oyente"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Nun se pudo enllazar con un socket"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Nun se pudo escuchar nel socket"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Nun se pudo determinar el nome del socket"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Nun se pudo mandar la orde PORT"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Direición de familia %u desconocida (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT falló; el sirvidor dixo: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Gandió'l tiempu de conexón col zócalu de datos"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Nun se pudo aceptar la conexón"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Hebo un problema al xenerar el hash del ficheru"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nun se pudo descargar el ficheru; el sirvidor dixo '%s'"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Gandió'l tiempu del zócalu de datos"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Falló la tresferencia de datos; el sirvidor dixo '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Consulta"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Nun se pudo invocar "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Coneutando a %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Nun se pudo coneutar a %s:%s (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Coneutando a %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nun se pudo resolver '%s'"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Fallu temporal al resolver '%s'"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Daqué raro asocedió resolviendo '%s:%s' (%i - %s)"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nun pudo coneutase a %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Atopóse polo menos una robla mala."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Fallu desconocíu al executar gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Les siguientes robles nun valieron:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2206,106 +2218,111 @@ msgstr ""
 "Les robles siguientes nun pudieron verificase porque la to llave pública nun "
 "ta a mano:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Esperando les testeres"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Obtúvose una sola llinia de testera penriba de %u carauteres"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Fallu na llinia testera"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "El sirvidor HTTP mandó una testera incorreuta de rempuesta"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "El sirvidor HTTP mandó una testera incorreuta de Content-Length"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "El sirvidor HTTP mandó una testera incorreuta de Content-Range"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Formatu de data desconocíu"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Falló la escoyeta"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Gandió'l tiempu de conexón"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Fallu al escribir nel ficheru de salida"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Fallu al escribir nel ficheru"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Fallu al escribir nel ficheru"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 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:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Fallu al lleer nel sirvidor"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Falló al francer el ficheru"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Datos de testera incorreutos"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Fallo la conexón"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Fallu internu"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Nun se puede facer mmap d'un ficheru baleru"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Nun pudo duplicase'l ficheru descriptor %i"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Nun se pudo facer mmap de %lu bytes"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "Nun pudo zarrase mmap"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "Nun se pudo sincronizase mmap "
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Nun se pudo facer mmap de %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Falló al francer el ficheru"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2314,7 +2331,7 @@ msgstr ""
 "Dynamic MMap escosó l'espaciu. Por favor aumenta'l tamañu de APT::Cache-"
 "Limit. El valor actual ye : %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2322,7 +2339,7 @@ msgid ""
 msgstr ""
 "Nun pudó incrementase'l tamañu de MMap col llímite de %lu bytes ya torgáu"
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2353,96 +2370,96 @@ msgstr "%limin %lis"
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Escoyeta %s que nun s'atopa"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Triba d'abreviatura que nun se reconoz: «%c»"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Abriendo ficheros de configuración %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Fallu de sintaxis %s:%u: Nun hai un nome al entamu del bloque."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Fallu de sintaxis %s:%u: Marca mal formada"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Fallu de sintaxis %s:%u: Puxarra extra dempués del valor"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Error de sintaxis %s:%u: Les directives pueden facese sólo nel nivel cimeru"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Fallu de sintaxis %s:%u: Demasiaes inclusiones añeraes"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Fallu de sintaxis %s:%u: Incluyendo dende equí"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Error de sintaxis %s:%u: La directiva '%s' nun ta sofitada"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Fallu de sintaxis %s:%u: Directiva llimpia requier un tres opciones como "
 "argumentos"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Fallu de sintaxis %s:%u: Puxarra extra al final del ficheru"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... ¡Fallu!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Fecho"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "La opción de llinia d'ordes '%c' [de %s] ye desconocida."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Nun s'entiende la opción %s de la llinia d'ordes"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "La opción %s de la llinia d'ordes nun ye un valor booleanu"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "La opción %s necesita un argumentu."
@@ -2452,339 +2469,352 @@ msgstr "La opción %s necesita un argumentu."
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Opción %s: L'axuste del elementu de configuración ha tener un =<val>."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "La opción %s pide un argumentu enteru, non '%s'"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Opción '%s' enforma llarga"
 
-#: 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 "El sentíu %s nun s'entiende, prueba con braeru o falsu."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Operación incorreuta: %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Nun puede algamase información del puntu de montaxe %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nun se pudo cambiar a %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Nun se pudo montar el CD-ROM"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nun puede abrise'l ficheru de bloquéu %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nun se pudo torgar %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperaba %s pero nun taba ellí"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, 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:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "El subprocesu %s recibió una señal %u."
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, 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:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "El subprocesu %s terminó de manera inesperada"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nun se pudo abrir el ficheru %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nun pudo abrise un ficheru descriptor %d"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Nun pudo criase'l soprocesu IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Nun pudo executase'l compresor "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, 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:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, 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:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problemes zarrando'l ficheru gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problemes zarrando'l ficheru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, 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:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Hai problemes desvenceyando'l ficheru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Hai problemes al sincronizar el ficheru"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Caché de paquetes balera."
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "El ficheru de caché de paquetes ta tollíu"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "El ficheru de caché de paquetes ye una versión incompatible"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "El ficheru de caché de paquetes ta tollíu"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Esti APT nun soporta'l sistema de versiones '%s'"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 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:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Depende de"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Predepende de"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Suxer"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Recomienda"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "En conflictu con"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Sustituye a"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Fai obsoletu a"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Ruempe"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "Aumenta"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "requeríu"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "estándar"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Creando árbol de dependencies"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Versiones candidates"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Xeneración de dependencies"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Lleendo información d'estáu"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Nun se pudo abrir el ficheru d'estáu %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Falló la escritura del ficheru temporal d'estáu %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "Llinia %lu mal formada na llista d'oríxe %s ([opción] nun parcheable)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 "Llinia %lu mal formada na llista d'oríxenes %s ([option] enforma curtia)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 "Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun ye una asignación)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun tien clave)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 "Llinia %lu mal formada na llista d'oríxenes %s ([%s] clave %s nun tien valor)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Llinia %lu mal formada na llista d'oríxenes %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist absoluta)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís de dist)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Llinia %u enforma llarga na llista d'oríxenes %s."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, 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:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2793,7 +2823,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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Nun pudo abrise'l ficheru '%s'"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2804,28 +2839,19 @@ msgstr ""
 "esencial %s por un cote de Conflictos/Pre-Dependencies. Esto normalmente ye "
 "malo, pero si daveres quies facelo, activa la opción  APT::Force-LoopBreak."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"Nun pudó facese la configuración inmediatamente nel desempaquetáu '%s'. Por "
-"favor, mira man 5 apt.conf embaxo APT::Immediate-Configure for details."
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 "El paquete %s necesita reinstalase, pero nun s'alcuentra un archivu pa el."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2833,11 +2859,11 @@ msgstr ""
 "Error, pkgProblemResolver::Resolve xeneró frañadures, esto puede ser pola "
 "mor de paquetes reteníos."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 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:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2846,234 +2872,196 @@ msgstr ""
 "Nun pudieron descargase dellos ficheros d'índiz; inoráronse o usáronse los "
 "antiguos nel so llugar."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Falta'l direutoriu de llistes %spartial."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Falta'l direutoriu d'archivos %spartial."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "Nun pudo bloquiase'l direutoriu %s"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Descargando ficheru %li de %li (falten %s)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Descargando ficheru %li de %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Nun pudo alncontrase'l controlador de métodu %s."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "El métodu %s nun entamó correchamente"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: 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:163
+#: 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"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Nun pudo lleese %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Has de poner delles URIs 'fonte' nel ficheru sources.list"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Nun pudieron analizase o abrise les llistes de paquetes o el ficheru d'estáu."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Has d'executar apt-get update pa iguar estos problemes"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Nun pudo lleese la llista de fontes."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "Rexistru inválidu nel ficheru de preferencies %s, nun hai cabecera Paquete"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Nun s'entiende'l tipu de pin %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Nun hai prioridá (o ye cero) conseñada pa pin"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "La caché tien un sistema de versiones incompatible"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Hebo un error al procesar %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Hebo un error al procesar %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Hebo un error al procesar %s (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Hebo un error al procesar %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Hebo un error al procesar %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Hebo un error al procesar %s (NewVersion%d)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Hebo un error al procesar %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Hebo un error al procesar %s (NewFileDesc2)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Hebo un error al procesar %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Coime, perpasaste'l númberu de nomes de paquete qu'esti APT ye a remanar."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Vaya, perpasaste'l númberu de versiones coles que puede esti APT."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Coime, perpasaste'l númberu de descripciones qu'esti APT ye a remanar."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 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:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Hebo un error al procesar %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Hebo un error al procesar %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, 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:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Recoyendo ficheros qu'apurren"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "Fallu de E/S al grabar caché d'oríxenes"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "falló'l cambiu de nome, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "La suma MD5 nun concasa"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "La suma hash nun concasa"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, 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:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3083,12 +3071,12 @@ msgstr ""
 "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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Fallu GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3097,7 +3085,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:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3106,7 +3094,7 @@ msgstr ""
 "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
 "necesites iguar manualmente esti paquete"
 
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3114,41 +3102,41 @@ msgstr ""
 "Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal "
 "paquete %s."
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "El tamañu nun concasa"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Nun se pudo parchear el ficheru release %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Ensin seiciones nel ficheru release %s"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Ensin entrada Hash nel ficheru release %s"
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, 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:125
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Entrada inválida pa 'Date' nel ficheru release %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "El bloque de fornidor %s nun contién una buelga dixital"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3157,41 +3145,41 @@ msgstr ""
 "Usando el puntu de montaxe de CD-ROM %s\n"
 "Montando el CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Identificando.. "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Etiqueta guardada: %s\n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "Desmontando l CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Usando el puntu de montaxe de CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Desmontando'l CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Esperando'l discu...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Montando'l CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Buscando nel discu ficheros d'índices...\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3200,7 +3188,7 @@ msgstr ""
 "Atopáu %zu indices de paquete, %zu indices de fonte, %zu indices de torna y "
 "%zu firmes\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3208,16 +3196,16 @@ msgstr ""
 "Nun s'alcuentra dengún paquete de ficheros, seique nun ye un Discu Debian o "
 "hai una arquiteutura inválida?"
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Atopóse la etiqueta: '%s'\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Esi nun ye un nome válidu; inténtalo otra vuelta.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3226,93 +3214,93 @@ msgstr ""
 "Esti discu llámase: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Copiando les llistes de paquetes..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Escribiendo llista nueva d'oríxenes\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 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:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i rexistros escritos.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, 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:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Escribiéronse %i rexistros con %i ficheros perdíos y %i ficheros que nun "
 "concasen\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Saltando'l ficheru non esistente %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Nun puede alcontrase'l rexistru d'autenticación pa: %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "El hash nun concasa pa: %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "L'aniellu de claves nun s'instaló en %s."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Nun s'alcontró la distribución '%s' pa '%s'"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Nun s'alcontró la versión '%s' pa '%s'"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Nun pudo alcontrase la xera '%s'"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Nun pueden seleicionase versiones pal paquete'%s' como puramente virtual"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3321,127 +3309,151 @@ msgstr ""
 "Nun puede seleicionase l'instalador o versión candidata pal paquete '%s' "
 "como non tien nengún d'ellos"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Nun puede seleicionase la versión más nueva pal paquete'%s' como puramente "
 "virtual"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Nun puede seleicionase versión candidata pal paquete %s que nun tien "
 "candidata"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Nun puede seleicionase versión instalada pal paquete %s que nun ta instalada"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Desinstalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "Desinstalóse dafechu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Anotando desaniciáu de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta'l direutoriu '%s'."
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Nun pudo abrise'l ficheru '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempaquetando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparándose pa configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "%s instaláu"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparándose pa desinstalar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "%s desinstaláu"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparándose pa desinstalar dafechu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "Desinstalóse dafechu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "Executando dpkt"
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemes de dependencies - déxase ensin configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3449,7 +3461,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:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3457,7 +3469,7 @@ msgstr ""
 "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
 "discu llenu"
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3465,14 +3477,14 @@ msgstr ""
 "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
 "memoria"
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu E/S "
 "dpkg"
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3481,14 +3493,14 @@ msgstr ""
 "Nun pudó bloquease'l direutoriu d'alministración (%s), ¿hai otru procesu "
 "usándolu?"
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Nun pudo bloquiase'l direutoriu d'alministración (%s), ¿yes root?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3496,30 +3508,30 @@ msgstr ""
 "dpkg interrumpióse, tienes qu'executar manualmente '%s' pa iguar el "
 "problema. "
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Non bloquiáu"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "Nun s'alcontró ficheru espeyu '%s'"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Nun s'alcontró ficheru espeyu '%s'"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Espeyu: %s]"
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3528,7 +3540,7 @@ msgstr ""
 "Nun pudo parchease %s con mmap y col usu de la operación de ficheru - el "
 "parche parez corruptu."
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3537,10 +3549,69 @@ msgstr ""
 "Nun pudo parchease %s con mmap (pero nun ye un fallu especificu de mmap) - "
 "el parche parez corruptu."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Conexón encaboxada prematuramente"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Nota: Esto faise automáticamente y baxo demanda por dpkg."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Saltu mal formáu %s llinia %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Saltu mal formáu %s llinia %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Saltu mal formáu %s llinia %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "descompresor"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "lleíos, entá tenía de lleer %lu pero nun queda nada"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "escritos, entá tenía d'escribir %lu pero nun pudo facerse"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "Nun pudó facese la configuración inmediatamente nel desempaquetáu '%s'. "
+#~ "Por favor, mira man 5 apt.conf embaxo APT::Immediate-Configure for "
+#~ "details."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Hebo un error al procesar %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Hebo un error al procesar %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Hebo un error al procesar %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Hebo un error al procesar %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Hebo un error al procesar %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Hebo un error al procesar %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Hebo un error al procesar %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Hebo un error al procesar %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Hebo un error al procesar %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Hebo un error al procesar %s (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Fallu internu, nun fui a atopar el miembru"
 
diff --git a/po/bg.po b/po/bg.po
index fe5c9c865..8f227a7b6 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.21\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+0200\n"
 "PO-Revision-Date: 2010-08-27 22:33+0300\n"
 "Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -21,150 +21,151 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Пакетът %s версия %s има неудовлетворена зависимост:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Общо имена на пакети : "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Общо пакетни структури: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Нормални пакети: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Чисти виртуални пакети: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Единични виртуални пакети: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Смесени виртуални пакети: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Липсващи: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Общо уникални версии: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Общо уникални описания: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Общо зависимости: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Общо отношения версия/файл: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Общо отношения описание/файл: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Общо отношения „Осигурява“: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Общо разгърнати низове: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Общо пространство за зависимости по версии: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Общо празно пространство: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Общо отчетено пространство: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Пакетният файл %s не е синхронизиран."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Няма намерени пакети"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "Трябва да въведете поне един шаблон за търсене"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Пакетът %s не може да бъде намерен"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Пакетни файлове:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Отбити пакети:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(не са намерени)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Инсталирана: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Кандидат: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(няма)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Отбиване на пакета: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Таблица с версиите:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -239,28 +240,28 @@ msgstr ""
 "cache=/tmp\n"
 "За повече информация вижте наръчниците apt-cache(8) и apt.conf(5).\n"
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Сложете диск в устройството и натиснете „Enter“"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Неуспех при монтиране на %s на %s"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Повторете този процес за останалите дискове от комплекта."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Аргументите не са по двойки"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -289,12 +290,12 @@ msgstr ""
 "  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s не е валиден DEB пакет."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -320,40 +321,40 @@ msgstr ""
 "  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Неуспех при записа на %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Не може да се извлече версията на debconf. Debconf инсталиран ли е?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Списъкът с разширения на пакети и твърде дълъг"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Списъкът с разширения на източници е твърде дълъг"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Грешка при запазването на заглавната част във файла със съдържание"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Грешка при обработката на съдържание %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -438,26 +439,26 @@ msgstr ""
 "  -c=?  Четене на този конфигурационен файл.\n"
 "  -o=?  Настройване на произволна конфигурационна опция"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Няма съвпадения на избора"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Липсват някои файлове от групата с файлови пакети „%s“"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "БД е повредена, файлът е преименуван на %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "БД е стара, опит за актуализиране на %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -465,111 +466,111 @@ msgstr ""
 "Невалиден формат на БД.  Ако сте обновили от по-стара версия на apt, "
 "премахнете базата от данни и я създайте наново."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, 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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Грешка при получаването на атрибути за %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "В архива няма поле „control“"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Неуспех при получаването на курсор"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Неуспех при четенето на директория %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Неуспех при четенето на %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: Грешките се отнасят за файла "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Неуспех при превръщането на %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Неуспех при обхода на дървото"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Неуспех при отварянето на %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr "DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Неуспех при прочитането на връзка %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Неуспех при премахването на връзка %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Неуспех при създаването на връзка %s към %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr "Превишен лимит на DeLink от %sB.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Архивът няма поле „package“"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s няма запис „override“\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: 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:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s няма запис „source override“\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s няма също и запис „binary override“\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Неуспех при заделянето на памет"
 
@@ -579,18 +580,18 @@ msgid "Unable to open %s"
 msgstr "Неуспех при отварянето на %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Неправилно форматиран override %s, ред %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Неправилно форматиран override %s, ред %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Неправилно форматиран override %s, ред %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -598,63 +599,51 @@ msgstr "Неправилно форматиран override %s, ред %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "Неуспех при четенето на override файл %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Непознат алгоритъм за компресия „%s“"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Компресираният изход %s изисква настройка за компресирането"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Неуспех при създаването на IPC pipe към подпроцеса"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Неуспех при създаването на FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Неуспех при пускането на подпроцес"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Процес-потомък за компресиране"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Вътрешна грешка, неуспех при създаването на %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Неуспех при създаването на подпроцес IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Неуспех при изпълнението на компресиращата програма "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "декомпресираща програма"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "В/И към подпроцеса/файла пропадна"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Неуспех при четене докато се изчислява MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Неуспех при премахването на връзка на %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Неуспех при преименуването на %s на %s"
@@ -663,75 +652,79 @@ msgstr "Неуспех при преименуването на %s на %s"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Грешка при компилирането на регулярния израз - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Следните пакети имат неудовлетворени зависимости:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "но е инсталиран %s"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "но ще бъде инсталиран %s"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "но той не може да бъде инсталиран"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "но той е виртуален пакет"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "но той не е инсталиран"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "но той няма да бъде инсталиран"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " или"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Следните НОВИ пакети ще бъдат инсталирани:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Следните пакети няма да бъдат променени:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Следните пакети ще бъдат актуализирани:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Следните задържани пакети ще бъдат променени:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (поради %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -739,59 +732,59 @@ msgstr ""
 "ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n"
 "Това НЕ би трябвало да става освен ако знаете точно какво правите!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu актуализирани, %lu нови инсталирани, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu преинсталирани, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu върнати към по-стара версия, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu за премахване и %lu без промяна.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu не са напълно инсталирани или премахнати.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Избиране на %s за задача „%s“\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Избиране на %s за регулярен израз „%s“\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Пакетът %s е виртуален пакет, осигурен от:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Инсталиран]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr " [версията не е кандидат]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Трябва изрично да изберете един за инсталиране."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -802,150 +795,150 @@ msgstr ""
 "Това може да означава, че пакета липсва, остарял е, или е достъпен\n"
 "само от друг източник\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Обаче следните пакети го заместват:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Пакетът „%s“ няма кандидат за инсталиране"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "Виртуални пакети като „%s“ не могат да се премахват\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Избиране на „%s“ вместо „%s“\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Пропускане на %s, който не е инсталиран при заявени само обновявания.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Преинсталацията на %s не е възможна, не може да бъде изтеглен.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s вече е най-новата версия.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s е отбелязан като ръчно инсталиран.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Избрана е версия %s (%s) за %s\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Избрана е версия %s (%s) за %s\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Пакетът %s не е инсталиран, така че не е премахнат\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Коригиране на зависимостите..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " пропадна."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Неуспех при коригирането на зависимостите"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Неуспех при минимизирането на набора актуализации"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Готово"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 "Възможно е да изпълните „apt-get -f install“, за да коригирате тези "
 "неизправности."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Неудовлетворени зависимости. Опитайте с „-f“."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Предупреждението за удостоверяването е пренебрегнато.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Инсталиране на тези пакети без проверка [y/N]?"
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Някои пакети не можаха да бъдат удостоверени"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Има проблеми и „-y“ е използвано без „--force-yes“"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Вътрешна грешка, „Ordering“ не завърши"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Странно.. Размерите не съвпадат, изпратете е-поща на apt@packages.debian.org"
 
 #. 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:1142
+#: cmdline/apt-get.cc:1156
 #, 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:1147
+#: cmdline/apt-get.cc:1161
 #, 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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -954,31 +947,31 @@ 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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n"
 
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Неуспех при определянето на свободното пространство в %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Нямате достатъчно свободно пространство в %s."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Указано е „Trivial Only“, но това не е тривиална операция."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Да, прави каквото казвам!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -989,28 +982,28 @@ msgstr ""
 "За да продължите, въведете фразата „%s“\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Прекъсване."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Искате ли да продължите [Y/n]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Неуспех при изтеглянето на %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Някои файлове не можаха да бъдат изтеглени"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Изтеглянето завърши в режим само на изтегляне"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1018,19 +1011,19 @@ msgstr ""
 "Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ "
 "или да опитате с „--fix-missing“?"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "„--fix-missing“ и превключване на носители не се поддържа все още"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Неуспех при коригирането на липсващите пакети."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Прекъсване на инсталирането."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1044,35 +1037,35 @@ msgstr[1] ""
 "Следните пакети са отстранени от системата поради препокриване на всичките "
 "им файлове от други пакети:"
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Това се прави автоматично от dpkg."
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Игнориране на несъществуващо издание „%s“ на пакета „%s“"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Използване на пакет източник „%s“ вместо „%s“\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Игнориране на несъществуваща версия „%s“ на пакета „%s“"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Командата „update“ не възприема аргументи"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1090,16 +1083,16 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Следната информация може да помогне за намиране на изход от ситуацията:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Вътрешна грешка, AutoRemover счупи нещо в системата"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1109,7 +1102,7 @@ msgstr[0] "Следният пакет е бил инсталиран автом
 msgstr[1] ""
 "Следните пакети са били инсталирани автоматично и вече не са необходими:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1118,19 +1111,19 @@ msgstr[0] "%lu пакет е бил инсталиран автоматично
 msgstr[1] ""
 "%lu пакета са били инсталирани автоматично и вече не са необходими:\n"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Използвайте „apt-get autoremove“ за да ги премахнете."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1138,7 +1131,7 @@ msgstr ""
 "Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или "
 "укажете разрешение)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1150,73 +1143,73 @@ msgstr ""
 "дистрибуция, че някои необходими пакети още не са създадени или пък\n"
 "са били преместени от Incoming."
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Счупени пакети"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Следните допълнителни пакети ще бъдат инсталирани:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Предложени пакети:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Препоръчвани пакети:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Неуспех при намирането на пакет %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s е отбелязан като автоматично инсталиран.\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Изчисляване на актуализацията..."
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Неуспех"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Готово"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Неуспех при заключването на директорията за изтегляне"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
 
-#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Неуспех при намирането на изходен код на пакет %s"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1226,7 +1219,7 @@ msgstr ""
 "адрес:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1238,88 +1231,88 @@ msgstr ""
 "за да изтеглите последните промени в пакета (евентуално в процес на "
 "разработка).\n"
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускане на вече изтегления файл „%s“\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Изтегляне на изходен код %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Неуспех при изтеглянето на някои архиви."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n"
 
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Командата за разпакетиране „%s“ пропадна.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
 
-#: cmdline/apt-get.cc:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Командата за компилиране „%s“ пропадна.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Процесът-потомък пропадна"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Трябва да укажете поне един пакет за проверка на зависимости за компилиране"
 
-#: cmdline/apt-get.cc:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Неуспех при получаването на информация за зависимостите за компилиране на %s"
 
-#: cmdline/apt-get.cc:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s няма зависимости за компилиране.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1328,7 +1321,7 @@ msgstr ""
 "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
 "не може да бъде намерен"
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1337,14 +1330,14 @@ msgstr ""
 "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
 "не може да бъде намерен"
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният "
 "пакет %s е твърде нов"
 
-#: cmdline/apt-get.cc:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1354,7 +1347,7 @@ msgstr ""
 "налични версии на пакета %s, които могат да удовлетворят изискването за "
 "версия"
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1363,30 +1356,30 @@ msgstr ""
 "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
 "не може да бъде намерен"
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s"
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени."
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Неуспех при обработката на зависимостите за компилиране"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Свързване с %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Поддържани модули:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1477,7 +1470,7 @@ msgstr ""
 "информация и опции.\n"
 "                           Това APT има Върховни Сили.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1489,33 +1482,33 @@ msgstr ""
 "           Заключването е деактивирано, така че не разчитайте\n"
 "           на повтаряемост в реална ситуация."
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Поп "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Изт:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Игн "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Грш "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Изтеглени %sB за %s (%sB/сек)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [В процес на работа]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1526,46 +1519,62 @@ msgstr ""
 " „%s“\n"
 "в устройството „%s“ и натиснете „Enter“\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "но той не е инсталиран"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s е отбелязан като ръчно инсталиран.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s е отбелязан като автоматично инсталиран.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s вече е най-новата версия.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s вече е най-новата версия.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s е отбелязан като ръчно инсталиран.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Неуспех при отварянето на %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1587,11 +1596,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Непознат запис за пакет!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1652,197 +1661,199 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Смесване на наличната информация"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Неуспех при създаването на програмни канали"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Неуспех при изпълнението на gzip"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Развален архив"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Невярна контролна сума на tar, развален архив"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Непозната заглавна част на TAR тип %u, елемент %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Невалиден подпис на архива"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Грешка при четене на заглавната част на елемента на архива"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "Невалидна заглавна част %s на елемента на архива"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Невалидна заглавна част на елемента на архива"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Архивът е твърде кратък"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Неуспех при четенето на заглавните части на архива"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "Извикан е DropNode за все още използван възел"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Грешка при намирането на хеш-елемента!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Неуспех при установяване на отклонението"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Вътрешна грешка в AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Опит за изменение на отклонение, %s -> %s и %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Двойно добавяне на отклонение %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Дублиран конфигурационен файл %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Неуспех при запис на файл %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Неуспех при затварянето на файл %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Пътят %s е твърде дълъг"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Разпакетиране на %s повече от веднъж"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Директорията %s е отклонена"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Пакетът се опитва да пише в целта за отклонение %s/%s"
 
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Пътят за отклонение е твърде дълъг"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Директорията %s се заменя с не-директория"
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "Неуспех при намирането на възел в неговия хеш"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Пътят е твърде дълъг"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Файловете се заменят със съдържанието на пакета %s без версия"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Файл %s/%s заменя този в пакет %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Неуспех при четенето на %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Неуспех при получаването на атрибути за %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Неуспех при премахването на %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Неуспех при създаването на %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Неуспех при получаването на атрибути %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "Директориите info и temp трябва да бъдат на една и съща файлова система"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Четене на списъците с пакети"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Неуспех при преминаването в администраторската директория %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Вътрешна грешка при получаването на името на пакета"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Четене на списъка на файловете"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1853,113 +1864,114 @@ msgstr ""
 "възстановите този файл, запишете го като празен и веднага преинсталирайте "
 "същата версия на пакета!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Неуспех при четенето на списъка с файлове %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Вътрешна грешка при получаването на възел"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Неуспех при отварянето на файл с отклонения %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 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
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Неправилен ред във файла с отклонения: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Вътрешна грешка при добавянето на отклонение"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "Първо трябва да се инициализира кеша с пакети"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Неуспех при намирането на заглавна част „Package:“, изместване %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Неправилна секция „ConfFile“ във файла за състояние. Изместване %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Грешка при анализирането на MD5. Изместване %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Това не е валиден DEB архив, липсва елемент „%s“"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 "Това не е валиден DEB архив, няма елемент „%s“, „%s“ или „%s“"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Неуспех при преминаването в %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Вътрешна грешка, неуспех при намирането на съставна част %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Неуспех при намирането на валиден контролен файл"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Контролен файл, невъзможен за анализ"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Неуспех при отварянето на програмен канал за %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Грешка при четене от процес %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Неуспех при получаването на атрибути"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Неуспех при задаването на време на промяна"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Неуспех при четенето на базата %s със CD-ROM"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1967,56 +1979,56 @@ msgstr ""
 "Използвайте „apt-cdrom“, за да може този CD-ROM да се разпознава от APT. "
 "„apt-get update“ не може да се използва за добавяне на нови дискове"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "Грешен CD-ROM"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Неуспех при демонтирането на CD-ROM в %s, може все още да се използва."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Дискът не е намерен."
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Файлът не е намерен"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Невалиден адрес-URI, локалните адреси-URI не трябва да започват с „//“"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Влизане"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Неуспех при установяването на името на отдалечения сървър"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Неуспех при установяването на локалното име"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Сървърът отказа свързване и съобщи: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER се провали, сървърът съобщи: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS се провали, сървърът съобщи: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2024,202 +2036,202 @@ msgstr ""
 "Беше указан сървър-посредник, но няма скрипт за влизане, Acquire::ftp::"
 "ProxyLogin е празен."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Командата „%s“ на скрипта за влизане се провали, сървърът съобщи: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE се провали, сървърът съобщи: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Допустимото време за свързването изтече"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Сървърът разпадна връзката"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Грешка при четене"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Отговорът препълни буфера."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Развален протокол"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Грешка при запис"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Неуспех при създаването на гнездо"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Неуспех при свързването на гнездо за данни, допустимото време за свързване "
 "изтече"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Неуспех при свързването на пасивно гнездо."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo не успя да се добере до слушащо гнездо"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Неуспех при свързването на гнездо"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Неуспех при слушането на гнездото"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Неуспех при определянето на името на гнездото"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Неуспех при изпращането на командата PORT"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Неизвестно семейство адреси %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT се провали, сървърът съобщи: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Времето за установяване на връзка с гнездо за данни изтече"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Невъзможно е да се приеме свързването"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Проблем при хеширане на файла"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Неуспех при изтеглянето на файла, сървърът съобщи „%s“"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Времето за връзка с гнездо за данни изтече"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Неуспех при прехвърлянето на данни, сървърът съобщи: „%s“"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Запитване"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Неуспех при извикването на "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Свързване с %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Не може да се започне свързване с %s:%s (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Неуспех при свързване с %s:%s (%s), допустимото време изтече"
 
-#: methods/connect.cc:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Свързване с %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Неуспех при намирането на IP адреса на „%s“"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Временен неуспех при намирането на IP адреса на „%s“"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i - %s)"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Неуспех при свързване с %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на "
 "ключа?!"
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Намерен е поне един невалиден подпис."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Неуспех при изпълнение на „gpgv“ за проверка на подписа (инсталиран ли е "
 "gpgv?)"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Неизвестна грешка при изпълнението на gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Следните подписи са невалидни:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2227,106 +2239,111 @@ msgstr ""
 "Следните подписи не можаха да бъдат проверени, защото публичния ключ не е "
 "наличен:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Чакане на заглавни части"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Получен е един ред на заглавна част с над %u символа"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Невалиден ред на заглавна част"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Неизвестен формат на дата"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Неуспех на избора"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Допустимото време за свързване изтече"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Грешка при записа на изходен файл"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Грешка при записа на файл"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Грешка при записа на файла"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Грешка при четене от сървъра"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Неуспех при отрязване на края на файла"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Невалидни данни на заглавната част"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Неуспех при свързването"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Вътрешна грешка"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Невъзможно е да се прехвърли в паметта празен файл"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Неуспех при дублиране на файлов манипулатор %i"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Неуспех при прехвърлянето в паметта на %lu байта"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "Неуспех при затваряне на mmap"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "Неуспех при синхронизирането на mmap"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Неуспех при прехвърлянето в паметта на %lu байта"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Неуспех при отрязване на края на файла"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2335,7 +2352,7 @@ msgstr ""
 "Недостатъчна памет за MMap. Увеличете стойността на променливата APT::Cache-"
 "Limit. Текуща стойност: %lu (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2344,7 +2361,7 @@ msgstr ""
 "Неуспех при увеличаване на паметта за MMap. Достигнато е текущото "
 "ограничение от %lu байта."
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2375,96 +2392,96 @@ msgstr "%liм %liс"
 msgid "%lis"
 msgstr "%liс"
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Изборът %s не е намерен"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Неизвестен тип на абревиатура: „%c“"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Отваряне на конфигурационен файл %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Синтактична грешка %s:%u: В началото на блока няма име."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Синтактична грешка %s:%u: Лошо форматиран таг"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Синтактична грешка %s:%u: Излишни символи след стойността"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Синтактична грешка %s:%u: Директиви могат да се задават само в най-горното "
 "ниво"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Синтактична грешка %s:%u: Твърде много вложени „include“"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Синтактична грешка %s:%u: Извикан „include“ оттук"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Синтактична грешка %s:%u: Неподдържана директива „%s“"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Синтактична грешка %s:%u: директивата clear изисква  аргумент дърво от опции"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Грешка!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Готово"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Неизвестна опция за команден ред „%c“ [от %s]."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Опцията за команден ред %s не е разпозната"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Опцията за команден ред %s не е булева"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Опция %s изисква аргумент."
@@ -2474,346 +2491,359 @@ msgstr "Опция %s изисква аргумент."
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Опция %s: Значението трябва да има =<val>."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Опция %s изисква аргумент цяло число, не „%s“"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Опция „%s“ е твърде дълга"
 
-#: 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 "Смисълът %s не е ясен, опитайте true или false."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Невалидна операция %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Неуспех при намирането на атрибутите на точка за монтиране %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Неуспех при преминаването в %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Неуспех при намирането на атрибутите на cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Не се използва заключване за файл за заключване %s, който е само за четене"
 
-#: apt-pkg/contrib/fileutl.cc:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Неуспех при отварянето на файл за заключване %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Не се използва заключване за файл за заключване %s, който е монтиран по NFS"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Неуспех при достъпа до заключване %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Изчака се завършването на %s, но той не беше пуснат"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s."
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Под-процесът %s получи сигнал %u."
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Подпроцесът %s върна код за грешка (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Подпроцесът %s завърши неочаквано"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Неуспех при отварянето на файла %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Неуспех при отварянето на файлов манипулатор %d"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Неуспех при създаването на подпроцес IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Неуспех при изпълнението на компресиращата програма "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr ""
 "грешка при четене, все още има %lu за четене, но няма нито един останал"
 
-#: apt-pkg/contrib/fileutl.cc:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "грешка при запис, все още име %lu за запис, но не успя"
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Проблем при затваряне на компресираният файл %s (gzip)"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Проблем при затваряне на файла %s"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Проблем при преименуване на файла %s на %s"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Проблем при изтриване на файла %s"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Проблем при синхронизиране на файла"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Празен кеш на пакети"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Файлът за кеш на пакети е повреден"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "Файлът за кеш на пакети е несъвместима версия"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Файлът за кеш на пакети е повреден"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Тази версия на APT не поддържа система за версии „%s“"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "Кешът на пакети е бил направен за различна архитектура"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Зависи от"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Предварително зависи от"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Предлага се"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Препоръчва се"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "В конфликт с"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Заменя"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Изважда от употреба"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Чупи"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "Подобрява"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "важен"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "изискван"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "стандартен"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "незадължителен"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "допълнителен"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Изграждане на дървото със зависимости"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Версии кандидати"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Генериране на зависимости"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Четене на информацията за състоянието"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Неуспех при отварянето на StateFile %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Неуспех при запис на временен StateFile %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Неуспех при анализирането на пакетен файл %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Неуспех при анализирането на пакетен файл %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 "Лошо форматиран ред %lu в списъка с източници %s (неразбираема [опция])"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 "Лошо форматиран ред %lu в списъка с източници %s (твърде кратка [опция])"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 "Лошо форматиран ред %lu в списъка с източници %s ([%s] не е присвояване)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Лошо форматиран ред %lu в списъка с източници %s (липсва ключ в [%s])"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 "Лошо форматиран ред %lu в списъка с източници %s ([%s] ключът %s няма "
 "стойност)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 "Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 "Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Отваряне на %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Ред %u в списъка с източници %s е твърде дълъг."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
 
-#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2822,7 +2852,12 @@ msgstr ""
 "Неуспех при незабавната настройка на „%s“. За повече информация вижте "
 "информацията за APT::Immediate-Configure в „man 5 apt.conf“. (%d)"
 
-#: apt-pkg/packagemanager.cc:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Неуспех при отваряне на файла „%s“"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2834,21 +2869,12 @@ msgstr ""
 "пакет %s. Това често е лошо, но ако наистина искате да го направите, "
 "активирайте опцията APT::Force-LoopBreak."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"Неуспех при незабавна настройка на разпакетиран „%s“. За повече информация "
-"прочетете за APT::Immediate-Configure в „man 5 apt.conf“."
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Не се поддържа индексен файл от типа „%s“"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2856,7 +2882,7 @@ msgstr ""
 "Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за "
 "него."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2864,12 +2890,12 @@ msgstr ""
 "Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е "
 "причинено от задържани пакети."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Неуспех при коригирането на проблемите, имате задържани счупени пакети."
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2878,239 +2904,201 @@ msgstr ""
 "Някои индексни файлове не можаха да бъдат изтеглени, те са пренебрегнати или "
 "са използвани по-стари."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Директорията със списъци %spartial липсва."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Директорията за архиви %spartial липсва."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "Неуспех при заключване на директорията %s"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Изтегляне на файл %li от %li (остават %s)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Изтегляне на файл %li от %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Неуспех при намирането на драйвер за метод %s."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Методът %s не стартира правилно"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
 
-#: apt-pkg/init.cc:147
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Пакетната система „%s“ не е поддържана"
 
-#: apt-pkg/init.cc:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Неуспех при определянето на подходяща пакетна система"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Неуспех при получаването на атрибути на %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Списъците с пакети или файлът за състояние не можаха да бъдат анализирани "
 "или отворени."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Списъкът с източници не можа да бъде прочетен."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Невалиден запис във файла с настройки %s, липсва заглавна част Package"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Неизвестен тип за отбиване %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Няма указан приоритет (или е нула) на отбиването"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Кешът има несъвместима система за версии"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Възникна грешка при обработката на %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Възникна грешка при обработката на %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Възникна грешка при обработката на %s (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Възникна грешка при обработката на %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Възникна грешка при обработката на %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Грешка при обработка на %s (NewVersion%d)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Възникна грешка при обработката на %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Възникна грешка при обработката на %s (NewFileDesc2)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Възникна грешка при обработката на %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на "
 "APT."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Еха, надхвърлихте броя описания, на който е способна тази версия на APT."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT."
 
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Възникна грешка при обработката на %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Възникна грешка при обработката на %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости"
 
-#: apt-pkg/pkgcachegen.cc:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 "Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Събиране на информация за „Осигурява“"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "преименуването се провали, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "Несъответствие на контролна сума MD5"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Несъответствие на контролната сума"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, 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:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3120,12 +3108,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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Грешка от GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3134,7 +3122,7 @@ msgstr ""
 "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
 "ръчно да оправите този пакет (поради пропусната архитектура)."
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3143,48 +3131,48 @@ msgstr ""
 "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
 "ръчно да оправите този пакет."
 
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Несъответствие на размера"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Неуспех при анализиране на файл Release %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Във файла Release %s липсват раздели"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Във файла Release %s липсва контролна сума"
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Неправилна стойност за „Valid-Until“ във файла Release %s"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Неправилна стойност за „Date“ във файла Release %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Блокът на производителя %s не съдържа отпечатък"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3193,41 +3181,41 @@ msgstr ""
 "Използване на точка за монтиране на CD-ROM %s\n"
 "Монтиране на CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Идентифициране..."
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Запазен етикет: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "Демонтиране на CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Използване на точка за монтиране на CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Демонтиране на CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Чакане за диск...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Монтиране на CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Сканиране на диска за индексни файлове...\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3236,7 +3224,7 @@ msgstr ""
 "Намерени са %zu индекса на пакети, %zu индекса на пакети с изходен код, %zu "
 "индекса с преводи и %zu подписа.\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3244,16 +3232,16 @@ msgstr ""
 "Не са намерени файлове с пакети. Мое би дискът не е с Дебиан или е за "
 "погрешна компютърна архитектура."
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Намерен е етикет „%s“\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Това не е валидно име, опитайте отново.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3262,90 +3250,90 @@ msgstr ""
 "Наименование на този диск: \n"
 "„%s“\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Копиране на списъците с пакети..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Запазване на новия списък с източници\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "Записите в списъка с източници за този диск са:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Записани са %i записа.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Записани са %i записа с %i липсващи файла.\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Записани са %i записа с %i несъответстващи файла\n"
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Пропускане на несъществуващ файл %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Не е намерен oторизационен запис за: %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Несъответствие на контролната сума за: %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "В %s няма инсталиран ключодържател."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Не е намерено издание „%s“ на „%s“"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Не е намерена версия „%s“ на „%s“"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Неуспех при намиране на задача „%s“"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "Не е възможно избиране на версия за пакета „%s“ понеже е виртуален"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3354,130 +3342,154 @@ msgstr ""
 "Не е възможно избиране на инсталирана или кандидат версия за пакета „%s“ "
 "понеже той няма нито едната"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Не е възможно избиране на на последната версия за пакета „%s“, защото е "
 "виртуален"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Не е възможно избиране на кандидат-версия за пакета „%s“, защото няма "
 "подходящ кандидати"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Не е възможно избиране на инсталирана версия на пакета „%s“, защото не е "
 "инсталиран"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "Инсталиране на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Конфигуриране на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Премахване на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "Окончателно премахване на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Отбелязване на изчезването на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Изпълнение на тригер след инсталиране %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Директорията „%s“ липсва"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Неуспех при отваряне на файла „%s“"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Подготвяне на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Разпакетиране на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Подготвяне на %s за конфигуриране"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "%s е инсталиран"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Подготвяне за премахване на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "%s е премахнат"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Подготовка за пълно премахване на %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s е напълно премахнат"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Неуспех при запис в журнала, openpty() се провали (дали /dev/pts е "
 "монтирана?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "Изпълняване на dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "отлагане на настройката поради неудовлетворени зависимости"
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3485,7 +3497,7 @@ msgstr ""
 "Доклад за зависимостите не е записан защото съобщението за грешка е породено "
 "от друга грешка."
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3493,7 +3505,7 @@ msgstr ""
 "Доклад за зависимостите не е записан защото грешката е причинена от "
 "недостатъчно дисково пространство"
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3501,13 +3513,13 @@ msgstr ""
 "Доклад за зависимостите не е записан защото грешката е причинена от "
 "недостатъчна оперативна памет"
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Доклад за зависимостите не е записан поради входно-изходна грешка с dpkg"
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3516,7 +3528,7 @@ msgstr ""
 "Неуспех при заключване на административната директория (%s). Може би се "
 "използва от друг процес?"
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
@@ -3525,7 +3537,7 @@ msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3533,30 +3545,30 @@ msgstr ""
 "Процесът dpkg е беше прекъснат. Проблемът трябва да се коригира чрез ръчно "
 "изпълнение на „%s“."
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Без заключване"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "Файлът „%s“ на огледалния сървър не е намерен "
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Файлът „%s“ на огледалния сървър не е намерен "
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Огледален сървър: %s]"
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3565,7 +3577,7 @@ msgstr ""
 "Неуспех при закърпване на %s с mmap и операции с файл – кръпката изглежда "
 "повредена."
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3574,10 +3586,69 @@ msgstr ""
 "Неуспех при закърпване на %s с mmap (без грешка, специфична за mmap) – "
 "кръпката изглежда повредена."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Връзката прекъсна преждевременно"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Това се прави автоматично от dpkg."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Неправилно форматиран override %s, ред %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Неправилно форматиран override %s, ред %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Неправилно форматиран override %s, ред %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "декомпресираща програма"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr ""
+#~ "грешка при четене, все още има %lu за четене, но няма нито един останал"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "грешка при запис, все още име %lu за запис, но не успя"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "Неуспех при незабавна настройка на разпакетиран „%s“. За повече "
+#~ "информация прочетете за APT::Immediate-Configure в „man 5 apt.conf“."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Възникна грешка при обработката на %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Възникна грешка при обработката на %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Възникна грешка при обработката на %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Възникна грешка при обработката на %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Възникна грешка при обработката на %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Грешка при обработка на %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Възникна грешка при обработката на %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Възникна грешка при обработката на %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Възникна грешка при обработката на %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Възникна грешка при обработката на %s (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Вътрешна грешка, не може да се открие елемент"
 
diff --git a/po/bs.po b/po/bs.po
index c85c979c2..0673837a0 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -15,152 +15,153 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paket %s verzije %s ima nezadovoljenu zavisnost:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Ukupno naziva paketa:"
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Ukupno naziva paketa:"
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Normalni paketi:"
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Čisto virtuelni paketi:"
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Pojedinačni virutuelni paketi:"
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Miješani virtuelni paketi:"
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Nedostajući:"
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Ukupno različitih verzija:"
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Ukupno različitih verzija:"
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Ukupno zavisnosti:"
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Paketi nisu pronađeni"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ne mogu pronaći paket %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Datoteke paketa:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Instalirano:"
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1682
+#: cmdline/apt-cache.cc:1686
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -197,28 +198,28 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Ne mogu otvoriti %s"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Argumenti nisu u parovima"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -246,12 +247,12 @@ msgstr ""
 "  -c=? Pročitaj ovu konfiguracijsku datoteku\n"
 "  -o=? Podesi odgovarajuću konfiguracijsku opciju, npr. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s nije ispravan DEB paket."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -265,41 +266,41 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Ne mogu zapisati na %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 "Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 ""
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -341,136 +342,136 @@ msgid ""
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr ""
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "DB je bila oštećena, datoteka preimenovana u %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB je stara, pokušavam nadogradnju %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, fuzzy, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Ne mogu otvoriti DB datoteku %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr ""
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Arhiva nema kontrolnog zapisa"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr ""
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr ""
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr ""
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr ""
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr ""
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr ""
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Ne mogu otvoriti %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr ""
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr ""
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr ""
 
@@ -481,17 +482,17 @@ msgstr ""
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
 #, c-format
-msgid "Malformed override %s line %lu #1"
+msgid "Malformed override %s line %llu #1"
 msgstr ""
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
 #, c-format
-msgid "Malformed override %s line %lu #2"
+msgid "Malformed override %s line %llu #2"
 msgstr ""
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
 #, c-format
-msgid "Malformed override %s line %lu #3"
+msgid "Malformed override %s line %llu #3"
 msgstr ""
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -499,63 +500,51 @@ msgstr ""
 msgid "Failed to read the override file %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr ""
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr ""
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr ""
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr ""
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr ""
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr ""
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr ""
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr ""
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr ""
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr ""
@@ -564,135 +553,139 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr ""
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "ali je %s instaliran"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "ali se ne može instalirati"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "ali je virtuelni paket"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "ali nije instaliran"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "ali se neće instalirati"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " ili"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Slijedeći NOVI paketi će biti instalirani:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Slijedeći paketi će biti UKLONJENI:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 #, fuzzy
 msgid "The following packages have been kept back:"
 msgstr "Slijedeći paketi su zadržani:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Slijedeći paketi će biti nadograđeni:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr ""
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr "[Instalirano]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 #, fuzzy
 msgid " [Not candidate version]"
 msgstr "Verzije kandidata"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr ""
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -700,178 +693,178 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Međutim, slijedeći paketi ga zamjenjuju:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr ""
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Ispravljam zavisnosti..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr ""
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Ne mogu ispraviti zavisnosti"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr ""
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Urađeno"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 #, fuzzy
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "Slijedeći paketi će biti nadograđeni:"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr ""
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of 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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of 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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr ""
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Da, uradi kako kažem!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -879,47 +872,47 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Odustani."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 #, fuzzy
 msgid "Do you want to continue [Y/n]? "
 msgstr "Da li želite nastaviti? [Y/n]"
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr ""
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Odustajem od instalacije."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -929,35 +922,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -973,15 +966,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -991,7 +984,7 @@ msgid_plural ""
 msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
 msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -999,25 +992,25 @@ msgid_plural ""
 msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
 msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1025,80 +1018,80 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Oštećeni paketi"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Predloženi paketi:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Preporučeni paketi:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Računam nadogradnju..."
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Neuspješno"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Urađeno"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1106,141 +1099,141 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2951
+#: cmdline/apt-get.cc:2986
 #, 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:2957
+#: cmdline/apt-get.cc:2992
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr ""
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Podržani moduli:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1286,7 +1279,7 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1294,33 +1287,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr ""
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr ""
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr ""
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr ""
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr ""
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr ""
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1328,46 +1321,62 @@ msgid ""
 "in the drive '%s' and press enter\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "ali nije instaliran"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Ne mogu otvoriti %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1389,11 +1398,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Nepoznat zapis paketa\""
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1441,196 +1450,198 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Sastavljam dostupne informacije"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Ne mogu izvršiti gzip"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Oštećena arhiva"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Arhiva je prekratka"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr ""
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr ""
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr ""
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr ""
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr ""
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr ""
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr ""
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, fuzzy, c-format
 msgid "Failed to write file %s"
 msgstr "Ne mogu ukloniti %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr ""
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr ""
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr ""
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr ""
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr ""
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Putanja je preduga"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, 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:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ne mogu čitati %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Ne mogu kreirati %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Čitam spiskove paketa"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, 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
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Čitam spisak datoteke"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1638,489 +1649,495 @@ msgid ""
 "package!"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 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
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 ""
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr ""
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, fuzzy, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Ne mogu otvoriti %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr ""
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr ""
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr ""
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr ""
 
-#: methods/cdrom.cc:208
+#: 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 ""
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 #, fuzzy
 msgid "Wrong CD-ROM"
 msgstr "Pogrešan CD"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Ne mogu demontirati CD-ROM na %s, moguće je da se još uvijek koristi."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 #, fuzzy
 msgid "Disk not found."
 msgstr "Datoteka nije pronađena"
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Datoteka nije pronađena"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Prijavljujem se"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr ""
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr ""
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr ""
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Server je zatvorio vezu"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Greška pri čitanju"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr ""
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 #, fuzzy
 msgid "Protocol corruption"
 msgstr "Oštećenje protokola"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Greška pri pisanju"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr ""
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr ""
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr ""
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr ""
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr ""
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr ""
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
-#: methods/connect.cc:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 
-#: methods/connect.cc:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Povezujem se sa %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr ""
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr ""
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Ne mogu se povezati sa %s %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Čekam na zaglavlja"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr ""
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Nepoznat oblik datuma"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "Ne mogu ukloniti %s"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Povezivanje neuspješno"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Unutrašnja greška"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
+#: apt-pkg/contrib/mmap.cc:117
 #, c-format
-msgid "Couldn't make mmap of %lu bytes"
+msgid "Couldn't make mmap of %llu bytes"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "Ne mogu kreirati %s"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "Ne mogu kreirati %s"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:311
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Ne mogu ukloniti %s"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2149,93 +2166,93 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr ""
@@ -2245,345 +2262,362 @@ msgstr ""
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "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 ""
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/contrib/fileutl.cc:841
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1087
 #, c-format
-msgid "read, still have %lu to read but none left"
+msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:874
+#: apt-pkg/contrib/fileutl.cc:1152
 #, c-format
-msgid "write, still have %lu to write but couldn't"
+msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+msgid "The package cache file is corrupted, it is too small"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Zavisi"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Unaprijed zavisi"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Predlaže"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Preporučuje"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 #, fuzzy
 msgid "Conflicts"
 msgstr "Sukobljava se sa"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Zamjenjuje"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Zastarijeva"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "važno"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "zahtijevano"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "standardno"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "opcionalno"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Gradim stablo zavisnosti"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Verzije kandidata"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Stvaranje zavisnosti"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 #, fuzzy
 msgid "Reading state information"
 msgstr "Sastavljam dostupne informacije"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, 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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2591,265 +2625,220 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:501
-#, 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
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "Ne mogu kreirati %s"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, fuzzy, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Čitam spisak datoteke"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: apt-pkg/init.cc:147
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr ""
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:274
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
 #, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
+msgid "Error occurred while processing %s (%s%d)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -2857,422 +2846,446 @@ msgid ""
 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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, 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:1698
+#: apt-pkg/acquire-item.cc:1709
 #, 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:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Ne mogu otvoriti DB datoteku %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ne mogu otvoriti DB datoteku %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr ""
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "Pogrešan CD"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 #, fuzzy
 msgid "Waiting for disc...\n"
 msgstr "Čekam na zaglavlja"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 #, fuzzy
 msgid "Copying package lists..."
 msgstr "Čitam spiskove paketa"
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Odustajem od instalacije."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "  Instalirano:"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Povezujem se sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Instalirano:"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Preporučuje"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, 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:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Ne mogu otvoriti %s"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index 4801c0c11..4b7a37ee6 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.15\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+0200\n"
 "PO-Revision-Date: 2011-06-16 01:41+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -18,150 +18,151 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "El paquet %s versió %s té una dependència sense satisfer:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Nombre total de paquets: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Nombre total d'estructures de paquets: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Paquets normals: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Paquets virtuals purs: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Paquets virtuals únics: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Paquets virtuals mixtes: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Falten: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Nombre total de versions diferents: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Nombre total de descripcions diferents: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Nombre total de dependències: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Nombre total de relacions versió/fitxer: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Nombre total de relacions descripció/fitxer: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Nombre total dels mapes aportats: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Nombre total de cadenes globals: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Nombre total de l'espai per a dependències de versió: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Nombre total de l'espai desperdiciat: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Nombre total de l'espai atribuït a: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "El fitxer %s del paquet està desincronitzat."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "No s'han trobat paquets"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 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:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Aquesta ordre és desfasada. Empreu «apt-mark showauto» en el seu lloc."
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "No s'ha trobat el paquet %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Fitxers de paquets:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Paquets etiquetats:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(no trobat)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Instaŀlat: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Candidat: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(cap)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Etiqueta del paquet: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Taula de versió:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -234,28 +235,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:77
+#: cmdline/apt-cdrom.cc:79
 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 Disk 1»"
 
-#: cmdline/apt-cdrom.cc:92
+#: cmdline/apt-cdrom.cc:94
 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:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "No s'ha pogut muntar '%s' a '%s'"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 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."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Els arguments no són en parells"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -283,12 +284,12 @@ msgstr ""
 "  -c=? Llegeix aquest fitxer de configuració\n"
 "  -o=? Estableix una opció de conf arbitrària, p. ex. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s no és un paquet DEB vàlid."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -312,40 +313,40 @@ 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:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "No es pot escriure en %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "No es pot determinar la versió de debconf. Està instaŀlat debconf?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "La llista de les extensions dels paquets és massa llarga"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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'ha produït un error en processar el directori %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "La llista d'extensions de les fonts és massa llarga"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "S'ha produït un error en escriure la capçalera al fitxer de continguts"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "S'ha produït un error en processar el fitxer de continguts %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -426,26 +427,26 @@ msgstr ""
 "  -c=?  Llegeix aquest fitxer de configuració\n"
 "  -o=?  Estableix una opció de configuració arbitrària"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "No s'ha trobat cap selecció"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "No es troben alguns fitxers dins del grup de fitxers del paquet `%s'"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "La base de dades està corrompuda, fitxer renomenat a %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "La BD és vella, s'està intentant actualitzar %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -453,111 +454,111 @@ msgstr ""
 "El format de la base de dades és invàlid. Si heu actualitzat des d'una "
 "versió més antiga de l'apt, suprimiu i torneu a crear la base de dades."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "No es pot obrir el fitxer de DB %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "No es pot determinar l'estat de %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Arxiu sense registre de control"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "No es pot aconseguir un cursor"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A: No es pot llegir el directori %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "A: No es pot veure l'estat %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "A: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: Els errors s'apliquen al fitxer "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "No s'ha pogut resoldre %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "L'arbre està fallant"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "No s'ha pogut obrir %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "No s'ha pogut llegir l'enllaç %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "No s'ha pogut alliberar %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** No s'ha pogut enllaçar %s a %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink s'ha arribat al límit de %sB.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Arxiu sense el camp paquet"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s no té una entrada dominant\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  el mantenidor de %s és %s, no %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s no té una entrada dominant de font\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s no té una entrada dominant de binari\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - No s'ha pogut assignar espai en memòria"
 
@@ -567,18 +568,18 @@ msgid "Unable to open %s"
 msgstr "No es pot obrir %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Línia predominant %s línia malformada %lu núm 1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Línia predominant %s línia malformada %lu núm 2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Línia predominant %s línia malformada %lu núm 3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -586,63 +587,51 @@ msgstr "Línia predominant %s línia malformada %lu núm 3"
 msgid "Failed to read the override file %s"
 msgstr "No s'ha pogut llegir la línia predominant del fitxer %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Algorisme de compressió desconegut '%s'"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "La sortida comprimida %s necessita un joc de compressió"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "No s'ha pogut crear el conducte IPC al subprocés"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "No s'ha pogut crear FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "No s'ha pogut bifurcar"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Comprimeix el fil"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "S'ha produït un error intern, no s'ha pogut crear %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "No s'ha pogut crear el subprocés IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "No s'ha pogut executar el compressor "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "decompressor"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "Ha fallat l'E/S del subprocés sobre el fitxer"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "No s'ha pogut llegir mentre es calculava la suma MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "S'ha trobat un problema treient l'enllaç %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "No s'ha pogut canviar el nom de %s a %s"
@@ -651,75 +640,79 @@ msgstr "No s'ha pogut canviar el nom de %s a %s"
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Els següents paquets tenen dependències sense satisfer:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "però està instaŀlat %s"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "però s'instaŀlarà %s"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "però no és instaŀlable"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "però és un paquet virtual"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "però no està instaŀlat"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "però no serà instaŀlat"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " o"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "S'instaŀlaran els paquets NOUS següents:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Es SUPRIMIRAN els paquets següents:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "S'han mantingut els paquets següents:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "S'actualitzaran els paquets següents:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Es DESACTUALITZARAN els paquets següents:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Es canviaran els paquets retinguts següents:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (per %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -727,59 +720,59 @@ msgstr ""
 "AVÍS: Es suprimiran els paquets essencials següents.\n"
 "Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu actualitzats, %lu nous a instaŀlar, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstaŀlats, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu desactualitzats, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu a suprimir i %lu no actualitzats.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu no instaŀlats o suprimits completament.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Nota: s'està seleccionant '%s' per a la tasca '%s'\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Nota: s'està seleccionant '%s' per a l'expressió regular '%s'\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "El paquet %s és un paquet virtual proveït per:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Instaŀlat]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr "[Versió no candidata]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Necessiteu seleccionar-ne un explícitament per a instaŀlar-lo."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -790,152 +783,152 @@ msgstr ""
 "en fa referència. Això normalment vol dir que el paquet falta,\n"
 "s'ha tornat obsolet o només és disponible des d'una altra font.\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Tot i que els següents paquets el reemplacen:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "El paquet «%s» no té candidat d'instaŀlació"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "Els paquets virtuals com «%s» no poden ser esborrats\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Nota: s'està seleccionant «%s» en lloc de «%s»\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "S'està ometent %s, ja està instaŀlat i l'actualització no està establerta.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "S'està ometent '%s', no està instaŀlat i només es demana l'actualització.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "No es possible la reinstaŀlació del paquet %s, no es pot baixar.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ja es troba en la versió més recent.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "S'ha marcat %s com instaŀlat manualment.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versió seleccionada '%s' (%s) per a '%s'\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Versió seleccionada «%s» (%s) per a «%s» degut a «%s»\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "El paquet %s no està instaŀlat, així doncs no es suprimirà\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "S'estan corregint les dependències…"
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " ha fallat."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "No es poden corregir les dependències"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "No es pot minimitzar el joc de versions revisades"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Fet"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Potser voldreu executar «apt-get -f install» per a corregir-ho."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependències sense satisfer. Proveu-ho emprant -f."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVÍS: No es poden autenticar els següents paquets!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "S'ha descartat l'avís d'autenticació.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Voleu instaŀlar aquests paquets sense verificar-los [s/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "No s'ha pogut autenticar alguns paquets"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets "
 "trencats!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "Els paquets necessiten ser suprimits però s'ha inhabilitat la supressió."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Què estrany… les mides no coincideixen, informeu a apt@packages.debian.org"
 
 #. 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "S'ha d'obtenir %sB/%sB d'arxius.\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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "S'ha d'obtenir %sB d'arxius.\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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -943,31 +936,31 @@ 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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 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:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "No s'ha pogut determinar l'espai lliure en %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "No teniu prou espai lliure en %s."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "S'ha especificat «Trivial Only» però aquesta operació no és trivial."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Sí, fes el que et dic!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -978,28 +971,28 @@ msgstr ""
 "Per continuar escriviu la frase «%s»\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Avortat."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Voleu continuar [S/n]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "No s'ha pogut obtenir %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Alguns fitxers no s'han pogut baixar"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Baixada completa i en mode de només baixada"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1007,19 +1000,19 @@ msgstr ""
 "No es poden baixar alguns arxius, proveu a executar apt-get update o "
 "intenteu-ho amb --fix-missing."
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing i els medi intercanviables actualment no estan suportats"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "No es poden corregir els paquets que falten."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "S'està avortant la instaŀlació."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1033,37 +1026,37 @@ msgstr[1] ""
 "Els següents paquets han desaparegut del vostre sistema ja\n"
 "que tots els fitxers s'han sobreescrit per altres paquets:"
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Nota: Això ho fa el dpkg automàticament i a propòsit."
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Ignora la versió objectiu «%s» no disponible del paquet «%s»"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "S'està agafant «%s» com a paquet font en lloc de '%s'\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Descarta la versió «%s» no disponible del paquet «%s»"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "L'ordre update no pren arguments"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor "
 "automàtic"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1081,15 +1074,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "La informació següent pot ajudar-vos a resoldre la situació:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1100,7 +1093,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Els paquets següents s'han instaŀlat automàticament i ja no són necessaris:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1110,19 +1103,19 @@ msgstr[0] ""
 msgstr[1] ""
 "Els paquets %lu es van s'instaŀlar automàticament i ja no són necessaris:\n"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Empreu «apt-get autoremove» per a suprimir-los."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Error intern, AllUpgrade ha trencat coses"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Potser voldreu executar «apt-get -f install» per corregir-ho:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1130,7 +1123,7 @@ msgstr ""
 "Dependències insatisfetes. Proveu amb «apt-get -f install» sense paquets (o "
 "especifiqueu una solució)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1142,33 +1135,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:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Paquets trencats"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "S'instaŀlaran els següents paquets extres:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Paquets suggerits:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Paquets recomanats:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "No s'ha pogut trobar el paquet %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "S'ha marcat %s com instaŀlat automàticament.\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -1176,42 +1169,42 @@ msgstr ""
 "Aquesta ordre és desfasada. Empreu «apt-mark auto» i «apt-mark manual» en el "
 "seu lloc."
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "S'està calculant l'actualització… "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Ha fallat"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Fet"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 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:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "No és possible blocar el directori de descàrrega"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr "S'està baixant %s %s"
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 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:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, 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:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1221,7 +1214,7 @@ msgstr ""
 "versions «%s» a:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1233,89 +1226,89 @@ msgstr ""
 "per a obtenir les últimes actualitzacions (possiblement no publicades) del "
 "paquet.\n"
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "S'està ometent el fitxer ja baixat «%s»\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Es necessita baixar %sB d'arxius font.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obtén el font %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "No s'ha pogut baixar alguns arxius."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, 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:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "L'ordre de construir «%s» ha fallat.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Ha fallat el procés fill"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 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:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, 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:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no té dependències de construcció.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1324,7 +1317,7 @@ msgstr ""
 "La dependència %s en %s no es pot satisfer per que no es pot trobar el "
 "paquet %s"
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1333,14 +1326,14 @@ msgstr ""
 "La dependència %s en %s no es pot satisfer per que no es pot trobar el "
 "paquet %s"
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1349,7 +1342,7 @@ msgstr ""
 "La dependència %s per a %s no es pot satisfer per que cap versió del paquet "
 "%s pot satisfer els requeriments de versions"
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1358,30 +1351,30 @@ msgstr ""
 "La dependència %s en %s no es pot satisfer per que no es pot trobar el "
 "paquet %s"
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, 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:2996
+#: cmdline/apt-get.cc:3031
 #, 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:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "No es poden processar les dependències de construcció"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Registre de canvis per a %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Mòduls suportats:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1471,7 +1464,7 @@ msgstr ""
 "per a obtenir més informació i opcions.\n"
 "                       Aquest APT té superpoders bovins.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1483,33 +1476,33 @@ msgstr ""
 "      Tingueu en ment que el bloqueig està desactivat,\n"
 "      per tant, no es depèn de la situació actual real."
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Obj "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Bai:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ign "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Err "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "S'ha baixat %sB en %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Treballant]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1520,46 +1513,62 @@ msgstr ""
 " «%s»\n"
 "en la unitat «%s» i premeu Intro\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s no es pot marcar perquè no està instaŀlat.\n"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s ja estava marcat com instaŀlat manualment.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s ja estava marcat com instaŀlat automàticament.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s ja estava mantingut.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s ja estava sense marcar com a mantingut.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "S'ha establert %s com a mantingut.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "S'ha canceŀlat la marca com a mantingut de %s.\n"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr "Ha fallat l'execució del dpkg. Sou el superusuari?"
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1601,11 +1610,11 @@ msgstr ""
 "  -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ó."
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Registre del paquet desconegut!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1668,198 +1677,200 @@ msgstr ""
 msgid "Merging available information"
 msgstr "S'està fusionant la informació disponible"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "No es poden crear els conductes"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "No es pot executar el gzip "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Arxiu corromput"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "La suma de comprovació de tar ha fallat, arxiu corromput"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Capçalera TAR desconeguda del tipus %u, membre %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Signatura de l'arxiu no vàlida"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "S'ha produït un error en llegir la capçalera del membre de l'arxiu"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "La capçalera %s del membre de l'arxiu no és vàlida"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "La capçalera del membre de l'arxiu no és vàlida"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "L'arxiu és massa petit"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Ha fallat la lectura de les capçaleres de l'arxiu"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "DropNode crida a un node que encara està enllaçat"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "No s'ha trobat l'element diseminat!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "No s'ha pogut assignar la desviació"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "S'ha produït un error intern en AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "S'està intentant sobreescriure una desviació, %s -> %s i %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Afegit doble d'una desviació %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Fitxer de conf. duplicat %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "No s'ha pogut escriure el fitxer %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Ha fallat el tancament del fitxer %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "La ruta %s és massa llarga"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "S'està desempaquetant %s més d'una vegada"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "El directori %s està desviat"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "La ruta de desviació és massa llarga"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "No s'ha trobat el node dins de la taula"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "La ruta és massa llarga"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, 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:429
+#: apt-inst/extract.cc:432
 #, 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"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "No es pot llegir %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "No es pot veure l'estat de %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "No es pot suprimir %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "No es pot crear %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "No s'ha pogut fer «stat» de %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "La info i els directoris temp necessiten estar en el mateix sistema de "
 "fitxers"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "S'està llegint la llista de paquets"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "No s'ha pogut canviar al directori d'administració %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "S'ha produït un error intern en obtenir un nom de paquet"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "S'està llegint el llistat de fitxers"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1870,113 +1881,114 @@ msgstr ""
 "aquest fitxer, creeu-lo buit i torneu a instaŀlar immediatament la mateixa "
 "versió del paquet!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "No s'ha pogut llegir la llista del fitxer %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "S'ha produït un error en obtenir un node"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "S'ha produït un error en obrir el fitxer de desviació %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "El fitxer de desviació està corrupte"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Línia no vàlida al fitxer de desviació: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "S'ha produït un error intern en afegir una desviació"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "Primer s'ha d'inicialitzar la memòria cau d'aquest paquet"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "No s'ha trobat una capçalera Package:, desplaçament %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Secció ConfFile dolenta al fitxer d'estat. Desplaçament %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "S'ha produït un error en analitzar la suma MD5. Desplaçament %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Aquest no és un arxiu DEB vàlid, falta el membre «%s»"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 "Aquest no és un arxiu DEB vàlid, li manca el membre «%s», «%s» o «%s»"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "No s'ha pogut canviar a %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Error intern, no s'ha pogut localitzar al membre %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "No s'ha trobat un fitxer de control vàlid"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "El fitxer de control no es pot analitzar"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr "Els fitxers buits no poden ser arxius vàlids"
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "No s'ha pogut obrir un conducte per a %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "S'ha produït un error en llegir des del procés %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "L'estat ha fallat"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "No s'ha pogut establir el temps de modificació"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "No es pot llegir la base de dades del cdrom %s"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1984,56 +1996,56 @@ msgstr ""
 "Si us plau, useu apt-cdrom per a que aquest CD sigui reconegut per APT. No "
 "pot emprar-se apt-get update per afegir-ne de nous"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "CD erroni"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "No es pot muntar el CD-ROM en %s, potser estigui encara en ús."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "No s'ha trobat el disc"
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Fitxer no trobat"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI no vàlid, els URI locals no han de començar per //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "S'està accedint a"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "No es pot determinar el nom de la màquina distant"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "No es pot determinar el nom local"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "El servidor ha rebutjat la nostra connexió i ha dit: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER ha fallat, el servidor ha dit: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS ha fallat, el servidor ha dit: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2041,201 +2053,201 @@ msgstr ""
 "S'ha especificat un servidor intermediari però no un script d'accés, "
 "Acquire::ftp::ProxyLogin està buit."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "L'ordre «%s» de l'script d'accés ha fallat, el servidor ha dit: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE ha fallat, el servidor ha dit: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Temps de connexió finalitzat"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "El servidor ha tancat la connexió"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Error de lectura"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Una resposta ha desbordat la memòria intermèdia."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Protocol corromput"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Error d'escriptura"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "No s'ha pogut crear un sòcol"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "No s'ha pogut connectar amb el sòcol de dades, connexió finalitzada"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "No s'ha pogut connectar amb el sòcol passiu."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "gettaddrinfo no es pot obtenir un sòcol que escolte"
 
 # abastar? huh? jm
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "No s'ha pogut vincular a un connector"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "No s'ha pogut escoltar sobre el sòcol"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "No s'ha pogut determinar el nom del sòcol"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "No es pot enviar l'ordre PORT"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "La família d'adreces %u és desconeguda (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT ha fallat, el servidor ha dit: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "S'ha esgotat el temps de connexió al sòcol de dades"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "No es pot acceptar la connexió"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Problema escollint el fitxer"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "No és possible obtenir el fitxer, el servidor ha dit '%s'"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "S'ha esgotat el temps d'espera per al sòcol de dades"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Ha fallat la transferència de dades, el servidor ha dit '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Consulta"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "No es pot invocar"
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "S'està connectant amb %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, 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:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "S'està connectant amb %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "No s'ha pogut resoldre '%s'"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "S'ha produït un error temporal en resoldre '%s'"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, 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:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "No es pot connectar amb %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "S'ha trobat almenys una signatura invàlida."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "No s'ha pogut executar «gpgv» per a verificar la signatura (està instaŀlat "
 "el gpgv?)"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "S'ha produït un error desconegut en executar el gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Les signatures següents són invàlides:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2243,107 +2255,112 @@ msgstr ""
 "Les signatures següents no s'han pogut verificar perquè la clau pública no "
 "està disponible:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "S'estan esperant les capçaleres"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "S'ha obtingut una capçalera d'una sola línea de més de %u caràcters"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Línia de capçalera incorrecta"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "El servidor HTTP ha enviat una capçalera de resposta no vàlida"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "El servidor HTTP ha enviat una capçalera de Content-Length no vàlida"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "El servidor HTTP ha enviat una capçalera de Content-Range no vàlida"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Aquest servidor HTTP té el suport d'abast trencat"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Format de la data desconegut"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Ha fallat la selecció"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Connexió finalitzada"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "S'ha produït un error en escriure al fitxer de sortida"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "S'ha produït un error en escriure al fitxer"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "S'ha produït un error en escriure al fitxer"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 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:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "S'ha produït un error en llegir des del servidor"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "No s'ha pogut truncar el fitxer %s"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Capçalera de dades no vàlida"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Ha fallat la connexió"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Error intern"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "No es pot transferir un fitxer buit a memòria"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "No s'ha pogut duplicar el descriptor del fitxer %i"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "No s'ha pogut crear un mapa de memòria de %lu octets"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "No es pot tancar el mmap"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "No es pot sincronitzar el mmap"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "No s'ha pogut crear un mapa de memòria de %lu octets"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "No s'ha pogut truncar el fitxer %s"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2352,7 +2369,7 @@ msgstr ""
 "No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-"
 "Limit. Valor actual: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2361,7 +2378,7 @@ msgstr ""
 "No s'ha pogut incrementar la mida del MMap ja que el limit de %lu bytes ja "
 "s'ha superat."
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2392,95 +2409,95 @@ msgstr "%limin %lis"
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "No s'ha trobat la selecció %s"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Abreujament de tipus no reconegut: «%c»"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "S'està obrint el fitxer de configuració %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Error sintàctic %s:%u: No comença el camp amb un nom."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Error sintàctic %s:%u: Etiqueta malformada"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Error sintàctic %s:%u Text extra després del valor"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Error sintàctic %s:%u: Es permeten directrius només al nivell més alt"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include niats"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Error sintàctic %s:%u: Inclusió des d'aquí"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Error sintàctic %s:%u: Directriu no suportada «%s»"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Error sintàctic %s:%u: la directiva clear requereix un arbre d'opcions com a "
 "argument"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Error sintàctic %s:%u: Text extra al final del fitxer"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s… Error!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s… Fet"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "L'opció de la línia d'ordres «%c» [de %s] és desconeguda."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "No s'entén l'opció de la línia d'ordres %s"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "No és lògica l'opció de la línia d'ordres %s"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "L'opció de la línia d'ordres %s precisa un paràmetre."
@@ -2490,81 +2507,81 @@ msgstr "L'opció de la línia d'ordres %s precisa un paràmetre."
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Opció %s: Paràmetre de configuració ha de ser en la forma =<val>"
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "L'opció %s precisa un paràmetre numèric, no '%s'"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "L'opció '%s' és massa llarga"
 
-#: 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 "El sentit %s no s'entén, proveu «true» (vertader) o «false» (fals)."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Operació no vàlida %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "No es pot obtenir informació del punt de muntatge %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "No es pot canviar a %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "No s'ha pogut fer «stat» del cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "No es pot resoldre el fitxer de blocat %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "No s'ha pogut blocar %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, 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:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, 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:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, 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:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2572,262 +2589,275 @@ msgstr ""
 "S'està descartant «%s» al directori «%s» perquè té una extensió del nom de "
 "fitxer invàlida"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperava %s però no hi era"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, 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:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, 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:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, 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:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "El sub-procés %s ha sortit inesperadament"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "No s'ha pogut obrir el fitxer %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, 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:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "No s'ha pogut crear el subprocés IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "No s'ha pogut executar el compressor "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "llegits, falten %lu per llegir, però no queda res"
 
-#: apt-pkg/contrib/fileutl.cc:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "escrits, falten %lu per escriure però no s'ha pogut"
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Ha hagut un problema en tancar el fitxer gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Ha hagut un problema en tancar el fitxer %s"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, 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:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Ha hagut un problema en desenllaçar el fitxer %s"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Ha hagut un problema en sincronitzar el fitxer"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Memòria cau de paquets és buida"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "El fitxer de memòria cau de paquets està corromput"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "El fitxer de memòria cau de paquets és una versió incompatible"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "El fitxer de memòria cau de paquets està corromput"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Aquest APT no suporta el sistema de versions «%s»"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 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:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Depèn"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Predepèn"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Suggereix"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Recomana"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Entra en conflicte"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Reemplaça"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Fa obsolet"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Trenca"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "Millores"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "important"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "requerit"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "estàndard"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "S'està construint l'arbre de dependències"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Versions candidates"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Dependències que genera"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "S'està llegint la informació de l'estat"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "No s'ha pogut obrir el fitxer d'estat %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "No es pot analitzar el fitxer del paquet %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "No es pot analitzar el fitxer del paquet %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 "Línia %lu malformada en la llista de fonts %s ([opció] no reconeixible)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Línia %lu malformada en la llista de fonts %s ([opció] massa curta)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 "Línia %lu malformada en la llista de fonts %s ([%s] no és una assignació)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Línia %lu malformada en la llista de fonts %s ([%s] no té clau)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 "Línia %lu malformada en la llista de fonts %s ([%s] la clau %s no té valor)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Línia %lu malformada en la llista de fonts %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Línia %lu malformada en la llista de fonts %s (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "S'està obrint %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 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:281
+#: apt-pkg/sourcelist.cc:285
 #, 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:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2836,7 +2866,12 @@ msgstr ""
 "No s'ha pogut realitzar la configuració immediata de '%s'. Consulteu man 5 "
 "apt.conf, secció APT::Immediate-Configure per a més detalls. (%d)"
 
-#: apt-pkg/packagemanager.cc:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "No s'ha pogut obrir el fitxer «%s»"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2848,28 +2883,19 @@ msgstr ""
 "dolenta, però si realment desitgeu fer-la, activeu l'opció APT::Force-"
 "LoopBreak."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"No s'ha pogut realitzar la configuració immediata de '%s' ja desempaquetat. "
-"Consulteu man 5 apt.conf, secció APT::Immediate-Configure per a més detalls."
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "El tipus de fitxer índex «%s» no està suportat"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 "El paquet %s necessita ser reinstaŀlat, però no se li pot trobar un arxiu."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2877,13 +2903,13 @@ msgstr ""
 "Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat "
 "causat per paquets retinguts."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 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:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2892,213 +2918,174 @@ 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:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Falta el directori de llistes %spartial."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Falta el directori d'arxius %spartial."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "No es pot blocar el directori %s"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "S'està obtenint el fitxer %li de %li (falten %s)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "S'està obtenint el fitxer %li de %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "No s'ha pogut trobar el mètode de control %s."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "El mètode %s no s'ha iniciat correctament"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: 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:163
+#: 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."
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "No es pot veure l'estat de %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Heu de posar algunes URI 'font' en el vostre sources.list"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "No s'han pogut analitzar o obrir les llistes de paquets o el fitxer d'estat."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Potser voldreu executar apt-get update per a corregir aquests problemes"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "No s'ha pogut llegir la llista de les fonts."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Registre no vàlid al fitxer de preferències %s, paquet sense capçalera"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "No s'ha entès el pin de tipus %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "No hi ha prioritat especificada per al pin (o és zero)"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "La memòria cau té un sistema de versions incompatible"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "S'ha produït un error durant el processament de %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "S'ha produït un error durant el processament de %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "S'ha produït un error durant el processament de %s (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "S'ha produït un error durant el processament de %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "S'ha produït un error durant el processament de %s (NewVersion%d)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "S'ha produït un error durant el processament de %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "S'ha produït un error durant el processament de %s (NewFileDesc2)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "S'ha produït un error durant el processament de %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Uau, heu excedit el nombre de paquets que aquest APT és capaç de gestionar."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Uau, heu excedit el nombre de versions que aquest APT és capaç de gestionar."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Uau, heu excedit el nombre de descripcions que aquest APT és capaç de "
 "gestionar. "
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Uau, heu excedit el nombre de dependències que aquest APT és capaç de "
 "gestionar."
 
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "S'ha produït un error durant el processament de %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr ""
-"S'ha produït un error durant el processament de %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, 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:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "S'estan recollint els fitxers que proveeixen"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "Error d'E/S en desar la memòria cau de la font"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "La suma MD5 no concorda"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "La suma resum no concorda"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3107,28 +3094,28 @@ 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, 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:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3139,12 +3126,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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "S'ha produït un error amb el GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3154,7 +3141,7 @@ msgstr ""
 "significar que haureu d'arreglar aquest paquet manualment (segons "
 "arquitectura)."
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3163,7 +3150,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:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3171,41 +3158,41 @@ msgstr ""
 "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
 "per al paquet %s."
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "La mida no concorda"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "No es pot analitzar el fitxer Release %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "No hi ha seccions al fitxer Release %s"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, 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:110
+#: apt-pkg/indexrecords.cc:118
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "No hi ha una entrada 'Valid-Until' vàlida al fitxer Release %s"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "No hi ha una entrada 'date' al fitxer Release %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "El camp del proveïdor %s no té una empremta digital"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3214,41 +3201,41 @@ msgstr ""
 "S'està utilitzant el punt de muntatge de CD-ROM %s\n"
 "S'està muntant el CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "S'està identificant…"
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "S'ha emmagatzemat l'etiqueta: %s\n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "S'esta desmuntant el CD-ROM…\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "S'està utilitzant el punt de muntatge de CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "S'està desmuntant el CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "S'està esperant al disc…\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "S'està muntant el CD-ROM…\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "S'està analitzant el disc per a fitxers d'índex…\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3257,7 +3244,7 @@ msgstr ""
 "S'han trobat %zu índexos de paquets, %zu índexos de fonts, %zu indexos de "
 "traduccions i %zu signatures\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3265,16 +3252,16 @@ msgstr ""
 "No s'ha pogut localitzar cap fitxer del paquet, potser no és un disc de "
 "Debian o la arquitectura és incorrecta?"
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "S'ha trobat l'etiqueta «%s»\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Aquest no és un nom vàlid, torneu-ho a provar.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3283,94 +3270,94 @@ msgstr ""
 "El disc es diu:\n"
 "«%s»\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "S'estan copiant les llistes de paquets…"
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "S'està escrivint una nova llista de fonts\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 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:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "S'han escrit %i registres.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, 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:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "S'han escrit %i registres, on falten %i fitxers i hi ha %i fitxers no "
 "coincidents\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "S'està ometent el fitxer %s que no existeix"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "No s'ha pogut trobar el registre d'autenticatió per a: %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "El resum no coincideix per a: %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "No s'ha instaŀlat cap clauer a %s."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "No s'ha trobat la versió puntual «%s» per a «%s»"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "No s'ha trobat la versió «%s» per a «%s»"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "No s'ha pogut trobar la tasca «%s»"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "No s'han pogut seleccionar les versions del paquet «%s» ja que és purament "
 "virtual"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3379,128 +3366,152 @@ msgstr ""
 "No s'han pogut seleccionar la versió instaŀlada ni la candidata del paquet "
 "«%s» ja que no estan disponibles cap de les dues"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "No s'ha pogut seleccionar la versió més nova del paquet «%s» ja que és "
 "purament virtual"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "No s'ha pogut seleccionar la versió candidata del paquet %s ja que no té "
 "candidata"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "No s'ha pogut seleccionar la versió instaŀlada del paquet %s ja que no està "
 "instaŀlada"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "S'està instaŀlant %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "S'està configurant el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "S'està suprimint el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "S'ha suprimit completament %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Anotant la desaparició de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Manca el directori «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "No s'ha pogut obrir el fitxer «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "S'està preparant el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "S'està desempaquetant %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "S'està preparant per a configurar el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "S'ha instaŀlat el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "S'està preparant per a la supressió del paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "S'ha suprimit el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "S'està preparant per a suprimir completament el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "S'ha suprimit completament el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "S'està executant dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "S'han produït problemes de depències, es deixa sense configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3508,7 +3519,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:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3516,7 +3527,7 @@ msgstr ""
 "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
 "disc ple"
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3524,14 +3535,14 @@ 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:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "No s'ha escrit cap informe perquè el missatge d'error indica d'una fallida "
 "d'I/O del dpkg"
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3540,14 +3551,14 @@ msgstr ""
 "No s'ha pogut bloquejar el directori d'administració (%s), hi ha cap altre "
 "procés utilitzant-lo?"
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "No es pot blocar el directori d'administració (%s), sou root?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3555,30 +3566,30 @@ msgstr ""
 "S'ha interromput el dpkg, harieu d'executar manualment «%s» per a corregir "
 "el problema."
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "No blocat"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "No s'ha trobat el fitxer rèplica «%s»"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "No s'ha pogut llegir el fitxer rèplica «%s»"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Rèplica: %s]"
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3587,7 +3598,7 @@ msgstr ""
 "No s'ha pogut apedaçar %s amb el mmap ni amb la utilització de la operació "
 "del fitxer - el pedaç sembla ser incorrecte"
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3596,10 +3607,70 @@ msgstr ""
 "No s'ha pogut apedaçar %s amb el mmap (però no s'ha produït un error "
 "específic del mmap)  - el pedaç sembla ser incorrecte"
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "La connexió s'ha tancat prematurament"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Nota: Això ho fa el dpkg automàticament i a propòsit."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Línia predominant %s línia malformada %lu núm 1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Línia predominant %s línia malformada %lu núm 2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Línia predominant %s línia malformada %lu núm 3"
+
+#~ msgid "decompressor"
+#~ msgstr "decompressor"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "llegits, falten %lu per llegir, però no queda res"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "escrits, falten %lu per escriure però no s'ha pogut"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "No s'ha pogut realitzar la configuració immediata de '%s' ja "
+#~ "desempaquetat. Consulteu man 5 apt.conf, secció APT::Immediate-Configure "
+#~ "per a més detalls."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "S'ha produït un error durant el processament de %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "S'ha produït un error durant el processament de %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "S'ha produït un error durant el processament de %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "S'ha produït un error durant el processament de %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "S'ha produït un error durant el processament de %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "S'ha produït un error durant el processament de %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "S'ha produït un error durant el processament de %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "S'ha produït un error durant el processament de %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr ""
+#~ "S'ha produït un error durant el processament de %s (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "S'ha produït un error intern, no s'ha trobat el membre"
 
diff --git a/po/cs.po b/po/cs.po
index 0a6cfc298..9a58b8d9c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+0200\n"
 "PO-Revision-Date: 2010-11-27 13:54+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -17,149 +17,150 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n>=2 && n<=4 ? 1 : 2;\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Balík %s verze %s má nesplněné závislosti:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Celkem názvů balíků: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Celkem struktur balíků: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Normálních balíků: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Čistě virtuálních balíků: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Jednoduchých virtuálních balíků: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Smíšených virtuálních balíků: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Chybějících: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Celkem různých verzí: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Celkem různých popisů: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Celkem závislostí: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Celkem vztahů ver/soubor: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Celkem vztahů popis/soubor: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Celkem poskytnutých mapování: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Celkem globovaných řetězců: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Celkem místa závislých verzí: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Celkem jalového místa: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Celkem přiřazeného místa: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Soubor balíku %s je špatně synchronizovaný."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Nebyly nalezeny žádné balíky"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "Musíte zadat alespoň jeden vyhledávací vzor"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nelze najít balík %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Soubory balíku:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Vypíchnuté balíky:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(nenalezeno)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Instalovaná verze: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Kandidát: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(žádná)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Vypíchnutý balík: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Tabulka verzí:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -233,28 +234,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:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 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:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Selhalo připojení „%s“ na „%s“"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 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."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Argumenty nejsou v párech"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -282,12 +283,12 @@ msgstr ""
 "  -c=? Načte tento konfigurační soubor\n"
 "  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s není platný DEB balík."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -310,40 +311,40 @@ msgstr ""
 "  -c=? Načte tento konfigurační soubor\n"
 "  -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nelze zapsat do %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Nelze určit verzi programu debconf. Je debconf nainstalován?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Seznam rozšíření balíku je příliš dlouhý"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Chyba zpracování adresáře %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Seznam zdrojových rozšíření je příliš dlouhý"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Chyba při zapisování hlavičky do souboru"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Chyba při zpracovávání obsahu %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -423,26 +424,26 @@ msgstr ""
 "  -c=?        Načte tento konfigurační soubor\n"
 "  -o=?        Nastaví libovolnou volbu"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Žádný výběr nevyhověl"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Některé soubory chybí v balíkovém souboru skupiny %s"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "DB je porušená, soubor přejmenován na %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB je stará, zkouším aktualizovat %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -450,111 +451,111 @@ msgstr ""
 "Formát databáze je neplatný. Pokud jste přešli ze starší verze apt, databázi "
 "prosím odstraňte a poté ji znovu vytvořte."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Nelze otevřít DB soubor %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Nelze vyhodnotit %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Archiv nemá kontrolní záznam"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Nelze získat kurzor"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Nelze číst adresář %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Nelze vyhodnotit %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: Chyby se týkají souboru "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Chyba při zjišťování %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Průchod stromem selhal"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Nelze otevřít %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr "Odlinkování %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Nelze přečíst link %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Nelze odlinkovat %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Nezdařilo se slinkovat %s s %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Odlinkovací limit %sB dosažen.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Archiv nemá pole Package"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr " %s nemá žádnou položku pro override\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  správce %s je %s, ne %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr " %s nemá žádnou zdrojovou položku pro override\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr " %s nemá ani žádnou binární položku pro override\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Selhal pokus o přidělení paměti"
 
@@ -564,18 +565,18 @@ msgid "Unable to open %s"
 msgstr "Nelze otevřít %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Zkomolený soubor %s, řádek %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Zkomolený soubor %s, řádek %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Zkomolený soubor %s, řádek %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -583,63 +584,51 @@ msgstr "Zkomolený soubor %s, řádek %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "Nezdařilo se přečíst override soubor %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Neznámý kompresní algoritmus „%s“"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Komprimovaný výstup %s potřebuje kompresní sadu"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Selhalo vytvoření meziprocesové roury k podprocesu"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Selhalo vytvoření FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Volání fork() se nezdařilo"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Komprimovat potomka"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Interní chyba, nezdařilo se vytvořit %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Nelze vytvořit podproces IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Nezdařilo se spustit kompresor "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "dekompresor"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "V/V operace s podprocesem/souborem selhala"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Chyba čtení při výpočtu MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Problém s odlinkováním %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Selhalo přejmenování %s na %s"
@@ -648,75 +637,79 @@ msgstr "Selhalo přejmenování %s na %s"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Chyba při kompilaci regulárního výrazu - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Následující balíky mají nesplněné závislosti:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "ale %s je nainstalován"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ale %s se bude instalovat"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "ale nedá se nainstalovat"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "ale je to virtuální balík"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "ale není nainstalovaný"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "ale nebude se instalovat"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " nebo"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Následující NOVÉ balíky budou nainstalovány:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Následující balíky budou ODSTRANĚNY:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Následující balíky jsou podrženy v aktuální verzi:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Následující balíky budou aktualizovány:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Následující balíky budou DEGRADOVÁNY:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Následující podržené balíky budou změněny:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (kvůli %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -724,59 +717,59 @@ msgstr ""
 "VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n"
 "Pokud přesně nevíte, co děláte, NEDĚLEJTE to!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu aktualizováno, %lu nově instalováno, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu přeinstalováno, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu degradováno, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu k odstranění a %lu neaktualizováno.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu instalováno nebo odstraněno pouze částečně.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Pozn: vybírám „%s“ pro úlohu „%s“\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Pozn: vybírám „%s“ pro regulární výraz „%s“\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Balík %s je virtuální balík poskytovaný:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr "[Instalovaný]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr " [Není kandidátská verze]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Měli byste explicitně vybrat jeden k instalaci."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -787,180 +780,180 @@ msgstr ""
 "To může znamenat že balík chybí, byl zastarán, nebo je dostupný\n"
 "pouze z jiného zdroje\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Nicméně následující balíky jej nahrazují:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Balík „%s“ nemá kandidáta pro instalaci"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "Virtuální balíky jako „%s“ nemohou být odstraněny\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Pozn: Vybírám „%s“ místo „%s“\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Přeskakuji %s, protože je již nainstalován.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Přeskakuji %s, protože není nainstalován a vyžadovány jsou pouze "
 "aktualizace.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Přeinstalace %s není možná, protože nelze stáhnout.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s je již nejnovější verze.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s nastaven jako instalovaný ručně.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Vybraná verze „%s“ (%s) pro „%s“\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Vybraná verze „%s“ (%s) pro „%s“\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Balík %s není nainstalován, nelze tedy odstranit\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Opravuji závislosti…"
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " selhalo."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Nelze opravit závislosti"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Nelze minimalizovat sadu pro aktualizaci"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Hotovo"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Pro opravení můžete spustit „apt-get -f install“."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nesplněné závislosti. Zkuste použít -f."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Autentizační varování potlačeno.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Instalovat tyto balíky bez ověření [y/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Některé balíky nemohly být autentizovány"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Vnitřní chyba, třídění nedoběhlo do konce"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Jak podivné… velikosti nesouhlasí, ohlaste to na apt@packages.debian.org"
 
 #. 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Potřebuji stáhnout %sB/%sB 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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Potřebuji stáhnout %sB 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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Po této operaci bude na disku použito dalších %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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 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:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nelze určit volné místo v %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "V %s nemáte dostatek volného místa."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Udáno „pouze triviální“, ovšem toto není triviální operace."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Ano, udělej to tak, jak říkám!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -971,28 +964,28 @@ msgstr ""
 "Pro pokračování opište frázi „%s“\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Přerušeno."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Chcete pokračovat [Y/n]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Selhalo stažení %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Některé soubory nemohly být staženy"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Stahování dokončeno v režimu pouze stáhnout"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1000,19 +993,19 @@ msgstr ""
 "Nelze stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --"
 "fix-missing?"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing a výměna média nejsou momentálně podporovány"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Nelze opravit chybějící balíky."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Přerušuji instalaci."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1029,35 +1022,35 @@ msgstr[2] ""
 "Následující balíky z tohoto systému zmizely, protože\n"
 "všechny jejich soubory byly přepsány jinými balíky:"
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Poznámka: Toto má svůj důvod a děje se automaticky v dpkg."
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Ignoruje se nedostupné vydání „%s“ balíku „%s“"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Vybírám „%s“ jako zdrojový balík místo „%s“\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Ignoruje se nedostupná verze „%s“ balíku „%s“"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Příkaz update neakceptuje žádné argumenty"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Neměli bychom mazat věci, nemůžu spustit AutoRemover"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1075,15 +1068,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Vnitřní chyba, AutoRemover pokazil věci"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1095,7 +1088,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Následující balíky byly nainstalovány automaticky a již nejsou potřeba:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1104,19 +1097,19 @@ msgstr[0] "%lu balík byl nainstalován automaticky a již není potřeba.\n"
 msgstr[1] "%lu balíky byly nainstalovány automaticky a již nejsou potřeba.\n"
 msgstr[2] "%lu balíků bylo nainstalováno automaticky a již nejsou potřeba.\n"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Pro jejich odstranění použijte „apt-get autoremove“."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Pro opravení následujících můžete spustit „apt-get -f install“:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1124,7 +1117,7 @@ msgstr ""
 "Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo "
 "navrhněte řešení)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1135,73 +1128,73 @@ 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:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Poškozené balíky"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Následující extra balíky budou instalovány:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Navrhované balíky:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Doporučované balíky:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nelze najít balík %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s nastaven jako instalovaný automaticky.\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Propočítávám aktualizaci… "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Selhalo"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Hotovo"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Nelze zamknout adresář pro stahování"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 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:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nelze najít zdrojový balík pro %s"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1210,7 +1203,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:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1221,107 +1214,107 @@ msgstr ""
 "použijte:\n"
 "bzr get %s\n"
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Přeskakuji dříve stažený soubor „%s“\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, 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:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Stáhnout zdroj %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Stažení některých archivů selhalo."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Příkaz pro rozbalení „%s“ selhal.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, 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:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Příkaz pro sestavení „%s“ selhal.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Synovský proces selhal"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 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:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nelze získat závislosti pro sestavení %s"
 
-#: cmdline/apt-get.cc:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nemá žádné závislosti pro sestavení.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen"
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen"
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový"
 
-#: cmdline/apt-get.cc:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1330,37 +1323,37 @@ msgstr ""
 "%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku "
 "%s, která odpovídá požadavku na verzi"
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen"
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Selhalo splnění %s závislosti pro %s: %s"
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, 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:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Chyba při zpracování závislostí pro sestavení"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Připojuji se k %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1448,7 +1441,7 @@ msgstr ""
 "a apt.conf(5).\n"
 "                       Tato APT má schopnosti svaté krávy.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1460,33 +1453,33 @@ msgstr ""
 "      Mějte také na paměti, že je vypnuto zamykání, tudíž\n"
 "      tyto výsledky nemusí mít s realitou nic společného!"
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Cíl "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Mám:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ign "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Err "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Staženo %sB za %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Pracuji]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1497,46 +1490,62 @@ msgstr ""
 " „%s“\n"
 "do mechaniky „%s“ a stiskněte enter\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "ale není nainstalovaný"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s nastaven jako instalovaný ručně.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s nastaven jako instalovaný automaticky.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s je již nejnovější verze.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s je již nejnovější verze.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s nastaven jako instalovaný ručně.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Nelze otevřít %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1558,11 +1567,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Neznámý záznam o balíku!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1620,196 +1629,198 @@ msgstr "chyby nad touto hláškou. Opravte je a poté znovu spusťte [I]nstalova
 msgid "Merging available information"
 msgstr "Slučuji dostupné informace"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Selhalo vytvoření roury"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Selhalo spuštění gzipu "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Porušený archiv"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Kontrolní součet taru selhal, archiv je poškozený"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Neznámá hlavička TARu typ %u, člen %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Neplatný podpis archivu"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Chyba při čtení záhlaví prvku archivu"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "Neplatné záhlaví prvku archivu %s"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Neplatné záhlaví prvku archivu"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Archiv je příliš krátký"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Chyba při čtení hlaviček archivu"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "Pokus o uvolnění uzlu (DropNode) na stále propojeném uzlu"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Nelze lokalizovat hashovací prvek!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Nelze alokovat diverzi"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Vnitřní chyba při AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Pokus o přepsání diverze, %s -> %s a %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Dvojí přidání diverze %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Duplicitní konfigurační soubor %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Selhal zápis souboru %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Selhalo zavření souboru %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Cesta %s je příliš dlouhá"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Rozbaluji %s vícekrát"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Adresář %s je odkloněn"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Diverzní cesta je příliš dlouhá"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Adresář %s bude nahrazen neadresářem"
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "Nelze nalézt uzel v jeho hashovacím kbelíku"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Cesta je příliš dlouhá"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, 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:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Soubor %s/%s přepisuje ten z balíku %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nelze číst %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Nelze vyhodnotit %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Selhalo odstranění %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Nelze vytvořit %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Selhalo vyhodnocení %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Adresáře info a temp musí být na stejném souborovém systému"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Čtu seznamy balíků"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Nepodařilo se změnit na admin adresář %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Vnitřní chyba při získávání jména balíku"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Čtu výpis souborů"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1820,113 +1831,114 @@ msgstr ""
 "obnovit, vytvořte jej nový prázdný a ihned znovu nainstalujte tu samou verzi "
 "balíku!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Chyba při čtení souboru se seznamy %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Vnitřní chyba při získávání uzlu"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Selhalo otevření souboru s diverzemi %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "Diverzní soubor je porušen"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Neplatná řádka v diverzním souboru: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Vnitřní chyba při přidávání diverze"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "Cache balíků se musí nejprve inicializovat"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Chyba při hledání Balíku: Hlavička, offset %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Špatná sekce ConfFile ve stavovém souboru na pozici %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Chyba při zpracování MD5. Offset %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Toto není platný DEB archiv, chybí část „%s“"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 "Toto není platný DEB archiv, neobsahuje část „%s“, „%s“ ani „%s“"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Nelze přejít do %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Vnitřní chyba, nemohu najít část %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Nelze najít platný kontrolní soubor"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Nezpracovatelný kontrolní soubor"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Nelze otevřít rouru pro %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Chyba čtení z procesu %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Selhalo vyhodnocení"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Nelze nastavit čas modifikace"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Nelze číst databázi na cdrom %s"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1934,56 +1946,56 @@ msgstr ""
 "Pro přidání CD do APTu použijte apt-cdrom. apt-get update nelze využít pro "
 "přidávání nových CD."
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "Chybné CD"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Nelze odpojit CD-ROM v %s - možná se stále používá."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Disk nebyl nalezen."
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Soubor nebyl nalezen"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Neplatné URI, lokální URI nesmí začínat na //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Nelze určit jméno druhé strany"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Nelze určit lokální jméno"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Server zamítl naše spojení a řekl: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER selhal, server řekl: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS selhal, server řekl: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -1991,196 +2003,196 @@ msgstr ""
 "Byl zadán proxy server, ale ne přihlašovací skript. Acquire::ftp::ProxyLogin "
 "je prázdný."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Příkaz „%s“ přihlašovacího skriptu selhal, server řekl: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE selhal, server řekl: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Čas spojení vypršel"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Server uzavřel spojení"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Chyba čtení"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Odpověď přeplnila buffer."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Porušení protokolu"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Chyba zápisu"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Nelze vytvořit socket"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "Nelze připojit datový socket, čas spojení vypršel"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Nelze připojit pasivní socket."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo nezískal naslouchající socket"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Nelze navázat socket"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Nelze naslouchat na socketu"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Nelze určit jméno socketu"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Nelze odeslat příkaz PORT"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Neznámá rodina adres %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT selhal, server řekl: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Spojení datového socketu vypršelo"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Nelze přijmout spojení"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Problém s hashováním souboru"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nelze stáhnout soubor, server řekl „%s“"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Datový socket vypršel"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Přenos dat selhal, server řekl „%s“"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Dotaz"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Nelze vyvolat "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Připojuji se k %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Nelze navázat spojení na %s:%s (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Připojuji se k %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nelze přeložit „%s“"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Dočasné selhání při zjišťování „%s“"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, 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:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nelze se připojit k %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Byl zaznamenán nejméně jeden neplatný podpis. "
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Neznámá chyba při spouštění gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Následující podpisy jsou neplatné:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2188,106 +2200,111 @@ msgstr ""
 "Následující podpisy nemohly být ověřeny, protože není dostupný veřejný "
 "klíč:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Čekám na hlavičky"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Získal jsem jednu řádku hlavičky přes %u znaků"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Chybná hlavička"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http server poslal neplatnou hlavičku odpovědi"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http server poslal neplatnou hlavičku Content-Length"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http server poslal neplatnou hlavičku Content-Range"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Tento HTTP server má porouchanou podporu rozsahů"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Neznámý formát data"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Výběr selhal"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Čas spojení vypršel"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupního souboru"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Chyba zápisu do souboru"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Chyba zápisu do souboru"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Chyba čtení ze serveru"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Nelze zmenšit soubor"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Špatné datové záhlaví"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Nelze provést mmap prázdného souboru"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Nelze duplikovat popisovač souboru %i"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Nešlo mmapovat %lu bajtů"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "Nelze zavřít mmap"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "Nelze synchronizovat mmap"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Nešlo mmapovat %lu bajtů"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Nelze zmenšit soubor"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2296,14 +2313,14 @@ msgstr ""
 "Dynamickému MMapu došlo místo. Zvyšte prosím hodnotu APT::Cache-Limit. "
 "Současná hodnota: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr "Nelze zvýšit velikost MMapu, protože limit %lu bajtů již byl dosažen."
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2334,96 +2351,96 @@ msgstr "%limin %lis"
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Výběr %s nenalezen"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Nerozpoznaná zkratka typu: „%c“"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Otevírám konfigurační soubor %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaktická chyba %s:%u: Blok nezačíná jménem."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntaktická chyba %s:%u: Zkomolená značka"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntaktická chyba %s:%u: Za hodnotou následuje zbytečné smetí"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Syntaktická chyba %s:%u: Direktivy je možné provádět pouze na nejvyšší úrovni"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntaktická chyba %s:%u: Příliš mnoho vnořených propojení (include)"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntaktická chyba %s:%u: Zahrnuto odtud"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktiva „%s“"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Syntaktická chyba %s:%u: Direktiva clear vyžaduje jako argument strom "
 "možností"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntaktická chyba %s:%u: Na konci souboru je zbytečné smetí"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s… Chyba!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s… Hotovo"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Parametr příkazové řádky „%c“ [z %s] je neznámý"
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Nerozumím parametru %s příkazové řádky"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Parametr příkazové řádky %s není pravdivostní hodnota"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Volba %s vyžaduje argument."
@@ -2433,336 +2450,349 @@ msgstr "Volba %s vyžaduje argument."
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Parametr %s: Zadání konfigurační položky musí obsahovat =<hodn>."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Volba %s vyžaduje jako argument celé číslo (integer), ne „%s“"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Volba „%s“ je příliš dlouhá"
 
-#: 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 "Nechápu význam %s, zkuste true nebo false."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Neplatná operace %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Nelze vyhodnotit přípojný bod %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nelze přejít do %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Nezdařilo se vyhodnotit cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nešlo otevřít zámkový soubor %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nelze získat zámek %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Čekal jsem na %s, ale nebyl tam"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Podproces %s obdržel chybu segmentace."
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Podproces %s obdržel signál %u."
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, 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:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Podproces %s neočekávaně skončil"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nelze otevřít soubor %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nelze otevřít popisovač souboru %d"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Nelze vytvořit podproces IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Nezdařilo se spustit kompresor "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "čtení, stále mám k přečtení %lu, ale už nic nezbývá"
 
-#: apt-pkg/contrib/fileutl.cc:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "zápis, stále mám %lu k zápisu, ale nejde to"
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problém při zavírání gzip souboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problém při zavírání souboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, 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:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problém při odstraňování souboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Problém při synchronizování souboru"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Cache balíků je prázdná"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Cache soubor balíků je poškozen"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "Cache soubor balíků je v nekompatibilní verzi"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Cache soubor balíků je poškozen"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Tato APT nepodporuje systém pro správu verzí „%s“"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "Cache balíků byla vytvořena pro jinou architekturu"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Závisí na"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Předzávisí na"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Navrhuje"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Doporučuje"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Koliduje s"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Nahrazuje"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Zastarává"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Porušuje"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "Rozšiřuje"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "důležitý"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "vyžadovaný"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "standardní"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "volitelný"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Vytvářím strom závislostí"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Kandidátské verze"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Generování závislostí"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Čtu stavové informace"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Nelze otevřít stavový soubor %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Nelze zapsat dočasný stavový soubor %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Nelze zpracovat soubor %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Nelze zpracovat soubor %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (nezpracovatelná [volba])"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (příliš krátká [volba])"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] není přiřazení)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] nemá klíč)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] klíč %s nemá hodnotu)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Otevírám %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2771,7 +2801,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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Nelze otevřít soubor „%s“"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2782,27 +2817,18 @@ msgstr ""
 "smyčce v Conflicts/Pre-Depends. To je často špatné, ale pokud to skutečně "
 "chcete udělat, aktivujte možnost APT::Force-LoopBreak."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"Nelze spustit okamžitou konfiguraci již rozbaleného balíku „%s“. Podrobnosti "
-"naleznete v man 5 apt.conf v části APT::Immediate-Configure."
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Indexový typ souboru „%s“ není podporován"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 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:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2810,11 +2836,11 @@ msgstr ""
 "Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno "
 "podrženými balíky."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 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:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2823,232 +2849,194 @@ msgstr ""
 "Některé indexové soubory se nepodařilo stáhnout, jsou ignorovány, nebo jsou "
 "použity starší verze."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Adresář seznamů %spartial chybí."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Archivní adresář %spartial chybí."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "Nelze uzamknout adresář %s"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Stahuji soubor %li z %li (%s zbývá)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Stahuji soubor %li z %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Ovladač metody %s nemohl být nalezen."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Metoda %s nebyla spuštěna správně"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: 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:163
+#: 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"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Nebylo možno vyhodnotit %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Do sources.list musíte zadat „zdrojové“ URI"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Seznamy balíků nebo stavový soubor nemohly být zpracovány nebo otevřeny."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Pro nápravu těchto problémů můžete zkusit spustit apt-get update"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Nelze přečíst seznam zdrojů."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Neplatný záznam v souboru preferencí %s, chybí hlavička Package"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Nerozumím vypíchnutí typu %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Cache má nekompatibilní systém správy verzí"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Při zpracování %s se objevila chyba (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Při zpracování %s se objevila chyba (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Při zpracování %s se objevila chyba (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Při zpracování %s se objevila chyba (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Při zpracování %s se objevila chyba (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Při zpracování %s se objevila chyba (NewVersion%d)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Při zpracování %s se objevila chyba (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Při zpracování %s se objevila chyba (NewFileDesc2)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Chyba při zpracování %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Wow, překročili jste počet jmen balíků, které tato APT umí zpracovat."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Wow, překročili jste počet verzí, které tato APT umí zpracovat."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Wow, překročili jste počet popisů, které tato APT umí zpracovat."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 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:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Chyba při zpracování %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Při zpracování %s se objevila chyba (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Collecting File poskytuje"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "Chyba IO při ukládání zdrojové cache"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "přejmenování selhalo, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "Neshoda MD5 součtů"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Neshoda kontrolních součtů"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Nelze zpracovat Release soubor %s"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1450
 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:1488
 #, 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:1510
 #, 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:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3058,12 +3046,12 @@ msgstr ""
 "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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Chyba GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3072,7 +3060,7 @@ msgstr ""
 "Nebyl jsem schopen 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:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3081,48 +3069,48 @@ msgstr ""
 "Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík "
 "opravit ručně."
 
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1768
 #, 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:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Velikosti nesouhlasí"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Nelze zpracovat Release soubor %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Release soubor %s neobsahuje žádné sekce"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Release soubor %s neobsahuje Hash záznam"
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, 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:125
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Neplatná položka „Date“ v Release souboru %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Blok výrobce %s neobsahuje otisk klíče"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3131,41 +3119,41 @@ msgstr ""
 "Používám přípojný bod %s\n"
 "Připojuji CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Rozpoznávám… "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Uložený název: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "Odpojuji CD-ROM…\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Používám přípojný bod %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Odpojuji CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Čekám na disk…\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Připojuji CD-ROM…\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Hledám na disku indexové soubory…\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3174,7 +3162,7 @@ msgstr ""
 "Nalezeny indexy balíků (%zu), indexy zdrojů (%zu), indexy popisů (%zu) a "
 "podpisy (%zu)\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3182,16 +3170,16 @@ msgstr ""
 "Nenalezeny žádné balíky. Možná to není disk s Debianem, nebo je pro jinou "
 "architekturu?"
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Nalezený název: „%s“\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Nejedná se o platné jméno, zkuste to znovu.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3200,90 +3188,90 @@ msgstr ""
 "Tento disk se nazývá: \n"
 "„%s“\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Kopíruji seznamy balíků…"
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Zapisuji nový seznam balíků\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "Seznamy zdrojů na tomto disku jsou:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Zapsáno %i záznamů.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, 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:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, 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"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Přeskakuji neexistující soubor %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Nelze najít autentizační záznam pro: %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Neshoda kontrolních součtů pro: %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "V %s není nainstalována žádná klíčenka."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Verze „%s“ pro „%s“ nebyla nalezena"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Nelze najít úlohu „%s“"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "Nelze vybrat verze balíku „%s“, protože je čistě virtuální"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3292,121 +3280,145 @@ msgstr ""
 "Nelze vybrat nainstalovanou ani kandidátskou verzi balíku „%s“, protože "
 "žádné takové verze nemá"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr "Nelze vybrat nejnovější verzi balíku „%s“, protože je čistě virtuální"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr "Nelze vybrat kandidátskou verzi balíku %s, protože žádnou nemá"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr "Nelze vybrat nainstalované verze balíku %s, protože není nainstalován"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "Instaluji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Nastavuji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Odstraňuji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "Kompletně odstraňuji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Značím si zmizení %s"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Adresář „%s“ chybí"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Nelze otevřít soubor „%s“"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Připravuji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozbaluji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Připravuji nastavení %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "Nainstalován %s"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Připravuji odstranění %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "Odstraněn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Připravuji úplné odstranění %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "Kompletně odstraněn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "Spouštím dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "problémy se závislostmi - ponechávám nezkonfigurované"
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3414,7 +3426,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:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3422,7 +3434,7 @@ msgstr ""
 "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
 "je chyba způsobena zcela zaplněným diskem."
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3430,57 +3442,57 @@ 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:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje "
 "chybu V/V dpkg."
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr "Nelze uzamknout administrační adresář (%s). Používá jej jiný proces?"
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Nelze uzamknout administrační adresář (%s). Jste root?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „%s“."
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Není uzamčen"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "Soubor se zrcadly %s nebyl nalezen "
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Soubor se zrcadly %s nebyl nalezen "
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Zrcadlo: %s]"
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3489,7 +3501,7 @@ msgstr ""
 "Nelze záplatovat %s pomocí mmapu a souborových operací - zdá se, že je "
 "záplata porušená."
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3498,10 +3510,68 @@ msgstr ""
 "Nelze záplatovat %s pomocí mmapu (ovšem žádná chyba specifická pro mmap "
 "nebyla zaznamenána) - zdá se, že je záplata porušená."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Spojení bylo předčasně ukončeno"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Poznámka: Toto má svůj důvod a děje se automaticky v dpkg."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Zkomolený soubor %s, řádek %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Zkomolený soubor %s, řádek %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Zkomolený soubor %s, řádek %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "dekompresor"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "čtení, stále mám k přečtení %lu, ale už nic nezbývá"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "zápis, stále mám %lu k zápisu, ale nejde to"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "Nelze spustit okamžitou konfiguraci již rozbaleného balíku „%s“. "
+#~ "Podrobnosti naleznete v man 5 apt.conf v části APT::Immediate-Configure."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Při zpracování %s se objevila chyba (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Při zpracování %s se objevila chyba (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Při zpracování %s se objevila chyba (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Při zpracování %s se objevila chyba (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Při zpracování %s se objevila chyba (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Při zpracování %s se objevila chyba (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Při zpracování %s se objevila chyba (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Při zpracování %s se objevila chyba (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Chyba při zpracování %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Při zpracování %s se objevila chyba (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Vnitřní chyba, nemohu nalézt člen"
 
diff --git a/po/cy.po b/po/cy.po
index a8ccb37b7..1aa225968 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: APT\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -15,170 +15,171 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package names: "
 msgstr "Cyfanswm Enwau Pecynnau : "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Cyfanswm Enwau Pecynnau : "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 #, fuzzy
 msgid "  Normal packages: "
 msgstr "  Pecynnau Normal: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 #, fuzzy
 msgid "  Pure virtual packages: "
 msgstr "  Pecynnau Cwbl Rhithwir: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 #, fuzzy
 msgid "  Single virtual packages: "
 msgstr "  Pecynnau Rhithwir Sengl: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 #, fuzzy
 msgid "  Mixed virtual packages: "
 msgstr "  Pecynnau Rhithwir Cymysg: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Ar Goll: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total distinct versions: "
 msgstr "Cyfanswm Fersiynau Gwahanol: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Cyfanswm Fersiynau Gwahanol: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 #, fuzzy
 msgid "Total dependencies: "
 msgstr "Cyfanswm Dibyniaethau: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 #, fuzzy
 msgid "Total ver/file relations: "
 msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 #, fuzzy
 msgid "Total Provides mappings: "
 msgstr "Cyfanswm Mapiau Darpariath: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 #, fuzzy
 msgid "Total globbed strings: "
 msgstr "Cyfanswm Llinynau Glob: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 #, fuzzy
 msgid "Total dependency version space: "
 msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 #, fuzzy
 msgid "Total slack space: "
 msgstr "Cyfanswm gofod Slac: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 #, fuzzy
 msgid "Total space accounted for: "
 msgstr "Cyfanswm Gofod Cyfrifwyd: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Canfuwyd dim pecyn"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Rhaid i chi ddarparu un patrwm yn union"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ni ellir lleoli'r pecyn %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 #, fuzzy
 msgid "Package files:"
 msgstr "Ffeiliau Pecynnau:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 #, fuzzy
 msgid "Pinned packages:"
 msgstr "Pecynnau wedi eu Pinio:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(heb ganfod)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Wedi Sefydlu: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Ymgeisydd: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(dim)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 #, fuzzy
 msgid "  Package pin: "
 msgstr "  Pin Pecyn: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 #, fuzzy
 msgid "  Version table:"
 msgstr "  Tabl Fersiynnau:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -251,11 +252,11 @@ 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:77
+#: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:92
+#: cmdline/apt-cdrom.cc:94
 #, fuzzy
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
@@ -263,20 +264,20 @@ msgstr ""
 " '%s'\n"
 "yn y gyrriant '%s' a gwasgwch Enter\n"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Methwyd ailenwi %s at %s"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Nid yw ymresymiadau mewn parau"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 #, fuzzy
 msgid ""
 "Usage: apt-config [options] command\n"
@@ -305,13 +306,13 @@ msgstr ""
 "  -c=? Darllen y ffeil cyfluniad\n"
 "  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "Nid yw %s yn becyn DEB dilys."
 
 # FIXME: "debian"
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 #, fuzzy
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
@@ -336,41 +337,41 @@ msgstr ""
 "  -c=? Darllen y ffeil cyfluniad hwn\n"
 "  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Ni ellir ysgrifennu i %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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
 #, fuzzy, c-format
 msgid "Error processing directory %s"
 msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, fuzzy, c-format
 msgid "Error processing contents %s"
 msgstr "Gwall wrth Brosesu Cynnwys %s"
 
 # FIXME: full stops
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 #, fuzzy
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
@@ -452,137 +453,137 @@ msgstr ""
 "  -c=?        Darllen y ffeil cyfluniad hwn\n"
 "  -o=?        Gosod opsiwn cyfluniad mympwyol"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Dim dewisiadau'n cyfateb"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn  `%s'"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Ni ellir agor y ffeil DB2 %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Methodd stat() o %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Does dim cofnod rheoli gan yr archif"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Ni ellir cael cyrchydd"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "Rh: Ni ellir gwneud stat() o %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "G: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "Rh: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Methwyd datrys %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Methwyd cerdded y goeden"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Methwyd agor %s"
 
 # FIXME
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DatGysylltu %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Methwyd darllen y cyswllt %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Methwyd datgysylltu %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Methwyd cysylltu %s at %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr "  Tarwyd y terfyn cyswllt %sB.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Doedd dim maes pecyn gan yr archif"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  Cynaliwr %s yw %s nid %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, fuzzy, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, fuzzy, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Methwyd neilltuo cof"
 
@@ -592,18 +593,18 @@ msgid "Unable to open %s"
 msgstr "Ni ellir agor %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -611,64 +612,52 @@ msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "Methwydd darllen y ffeil dargyfeirio %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, fuzzy, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Dull Cywasgu Anhysbys '%s'"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Methwyd creu pibell cyfathrebu at isbroses"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Methwyd creu FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Methodd fork()"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 #, fuzzy
 msgid "Compress child"
 msgstr "Plentyn Cywasgu"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, fuzzy, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Gwall Mewnol, Methwyd creu %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Methwyd creu isbroses IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Methwyd gweithredu cywasgydd "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "datgywasgydd"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "Methodd MA i isbroses/ffeil"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Methwyd darllen wrth gyfrifo MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Gwall wrth datgysylltu %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Methwyd ailenwi %s at %s"
@@ -677,78 +666,82 @@ msgstr "Methwyd ailenwi %s at %s"
 msgid "Y"
 msgstr "I"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Gwall crynhoi patrwm - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "ond mae %s wedi ei sefydlu"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "ond ni ellir ei sefydlu"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "ond mae'n becyn rhithwir"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "ond nid yw wedi ei sefydlu"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "ond nid yw'n mynd i gael ei sefydlu"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " neu"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Caiff y pecynnau canlynol eu TYNNU:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 #, fuzzy
 msgid "The following packages have been kept back:"
 msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 #, fuzzy
 msgid "The following packages will be upgraded:"
 msgstr "Caiff y pecynnau canlynol eu uwchraddio"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 #, fuzzy
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (oherwydd %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 #, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
@@ -758,61 +751,61 @@ msgstr ""
 "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
 "ei wneud!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu wedi ailsefydlu, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu wedi eu israddio, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Sefydliwyd]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 #, fuzzy
 msgid " [Not candidate version]"
 msgstr "Fersiynau Posib"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Dylech ddewis un yn benodol i'w sefydlu."
 
 # FIXME: punctuation
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, fuzzy, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -824,181 +817,181 @@ msgstr ""
 "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
 "ffeil sources.list.\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Yn cywiro dibyniaethau..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " wedi methu."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Ni ellir cywiro dibyniaethau"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Ni ellir bychanu y set uwchraddio"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Wedi Gorffen"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 #, fuzzy
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 #, fuzzy
 msgid "Some packages could not be authenticated"
 msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 #, fuzzy
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 #, fuzzy
 msgid "Internal error, Ordering didn't finish"
 msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Mae angen cyrchu %sB o archifau.\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:1154
+#: cmdline/apt-get.cc:1168
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\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:1159
+#: cmdline/apt-get.cc:1173
 #, fuzzy, c-format
 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:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Does dim digon o le rhydd yn %s gennych"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Does dim digon o le rhydd gennych yn %s."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Ie, gwna fel rydw i'n dweud!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, fuzzy, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1009,29 +1002,29 @@ msgstr ""
 "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
 " ?]"
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Erthylu."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 #, fuzzy
 msgid "Do you want to continue [Y/n]? "
 msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Methwyd cyrchu %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Methodd rhai ffeiliau lawrlwytho"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1039,20 +1032,20 @@ msgstr ""
 "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
 "geidio defnyddio --fix-missing?"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Ni ellir cywiro pecynnau ar goll."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 #, fuzzy
 msgid "Aborting install."
 msgstr "Yn Erthylu'r Sefydliad."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1062,35 +1055,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1106,16 +1099,16 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1125,7 +1118,7 @@ msgid_plural ""
 msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1133,21 +1126,21 @@ msgid_plural ""
 msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 #, fuzzy
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain:"
 
 # FIXME
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1156,7 +1149,7 @@ msgstr ""
 "pecyn (neu penodwch ddatrys)"
 
 # FIXME: needs commas
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1168,82 +1161,82 @@ msgstr ""
 "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
 "heb gael eu symud allan o Incoming."
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Pecynnau wedi torri"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Pecynnau a awgrymmir:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Pecynnau a argymhellir:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Methwyd canfod pecyn %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 #, fuzzy
 msgid "Calculating upgrade... "
 msgstr "Yn Cyfrifo'r Uwchraddiad... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Methwyd"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Wedi Gorffen"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 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:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1251,86 +1244,86 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, 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:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, fuzzy, c-format
 msgid "Fetch source %s\n"
 msgstr "Cyrchu Ffynhonell %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Methwyd cyrchu rhai archifau."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Methodd proses plentyn"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 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:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, 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:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1339,7 +1332,7 @@ msgstr ""
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
 "%s"
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1348,14 +1341,14 @@ msgstr ""
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
 "%s"
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1364,7 +1357,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:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1373,32 +1366,32 @@ msgstr ""
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
 "%s"
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Methwyd prosesu dibyniaethau adeiladu"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Yn cysylltu i %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 #, fuzzy
 msgid "Supported modules:"
 msgstr "Modylau a Gynhelir:"
 
 # FIXME: split
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1485,7 +1478,7 @@ msgstr ""
 "\n"
 "                   Mae gan yr APT hwn bŵerau buwch hudol.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1493,33 +1486,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Presennol "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Cyrchu:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Anwybyddu "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Gwall "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Gweithio]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, fuzzy, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1530,46 +1523,62 @@ msgstr ""
 " '%s'\n"
 "yn y gyrriant '%s' a gwasgwch Enter\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "ond nid yw wedi ei sefydlu"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Methwyd agor %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1591,11 +1600,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Cofnod pecyn anhysbys!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 #, fuzzy
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
@@ -1659,205 +1668,207 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Yn cyfuno manylion Ar Gael"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Methwyd creu pibau"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Methwyd gweithredu gzip"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Archif llygredig"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 #, fuzzy
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Methodd swm gwirio Tar, archif llygredig"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Math pennawd TAR anhysbys %u, aelod %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Llofnod archif annilys"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Gwall wrth ddarllen pennawd aelod archif"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, fuzzy, c-format
 msgid "Invalid archive member header %s"
 msgstr "Pennawd aelod archif annilys"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Pennawd aelod archif annilys"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Mae'r archif yn rhy fyr"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Methwyd darllen pennawdau'r archif"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Methyd lleoli yr elfen <hash>!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Methwyd neilltuo dargyfeiriad"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 #, fuzzy
 msgid "Internal error in AddDiversion"
 msgstr "Gwall Mewnol yn AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
 
 # FIXME: "the"
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Ffeil cyfluniad dyblyg %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, fuzzy, c-format
 msgid "Failed to write file %s"
 msgstr "Methwyd ysgrifennu ffeil %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Methwyd cau ffeil %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Mae'r llwybr %s yn rhy hir"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Yn dadbacio %s mwy nag unwaith"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Mae'r llwybr yn rhy hir"
 
 # FIXME: wtf?
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, 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"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ni ellir darllen %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Ni ellir gwneud stat() o %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Methwyd dileu %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Ni ellir creu %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Methwyd stat() ar %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 #, fuzzy
 msgid "Reading package lists"
 msgstr "Yn Darllen Rhestrau Pecynnau"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo"
 
 # FIXME
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 #, fuzzy
 msgid "Internal error getting a package name"
 msgstr "Gwall mewnol wrth gyrchu enw pecyn"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 #, fuzzy
 msgid "Reading file listing"
 msgstr "Yn Darllen Rhestr Ffeiliau"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1868,118 +1879,119 @@ msgstr ""
 "gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!"
 
 # FIXME
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 #, fuzzy
 msgid "Internal error getting a node"
 msgstr "Gwall Mewnol wrth gael Nôd"
 
 # FIXME: literal
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Methwyd agor y ffeil dargyfeirio %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "Mae'r ffeil dargyfeirio wed ei lygru"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 #, fuzzy
 msgid "Internal error adding a diversion"
 msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 #, fuzzy
 msgid "The pkg cache must be initialized first"
 msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, fuzzy, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Gwall wrth ramadegu MD5. Atred: %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 apt-inst/deb/debfile.cc:55
 #, fuzzy, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Methwyd newid i %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, fuzzy, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Methwyd lleoli ffeil rheoli dilys"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 #, fuzzy
 msgid "Unparsable control file"
 msgstr "Ffeil rheoli ni ellir ei ramadegu"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Methwyd agor pibell ar gyfer %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Gwall darllen o broses %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Methwyd stat()"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Methwyd gosod amser newid"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
 
-#: methods/cdrom.cc:208
+#: methods/cdrom.cc:212
 #, fuzzy
 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
@@ -1988,59 +2000,59 @@ msgstr ""
 "Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-"
 "get update i ychwanegu CDau newydd."
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 #, fuzzy
 msgid "Wrong CD-ROM"
 msgstr "CD Anghywir"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 "Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 #, fuzzy
 msgid "Disk not found."
 msgstr "Ffeil heb ei ganfod"
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Ffeil heb ei ganfod"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Yn mewngofnodi"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Ni ellir darganfod enw'r cymar"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Ni ellir darganfod yr enw lleol"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, fuzzy, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2049,329 +2061,334 @@ msgstr ""
 "ProxyLogin yn wag.)"
 
 # FIXME
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Goramser cysylltu"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Caeodd y gweinydd y cysylltiad"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Gwall darllen"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Gorlifodd ateb y byffer."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Llygr protocol"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Gwall ysgrifennu"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Methwyd creu soced"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 #, fuzzy
 msgid "Could not connect passive socket."
 msgstr "Methwyd cysylltu soced goddefol"
 
 # FIXME
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Methodd getaddrinfo gael soced gwrando"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Methwyd rhwymo soced"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Methwyd gwrando ar y soced"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Methwyd canfod enw'r soced"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Methwyd danfod gorchymyn PORT"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Goramserodd cysylltiad y soced data"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Methwyd derbyn cysylltiad"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Problem wrth stwnshio ffeil"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Goramserodd soced data"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Ymholiad"
 
 # FIXME
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Methwyd gweithredu "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Yn cysylltu i %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Yn cysylltu i %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Methwyd datrys '%s'"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Methiant dros dro yn datrys '%s'"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Methwyd cysylltu i %s %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Yn aros am benawdau"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Llinell pennawd gwael"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 #, fuzzy
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 #, fuzzy
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 #, fuzzy
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 #, fuzzy
 msgid "This HTTP server has broken range support"
 msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Fformat dyddiad anhysbys"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Methwyd dewis"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Goramserodd y cysylltiad"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Gwall wrth ysgrifennu at ffeil"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Gwall wrth ysgrifennu at y ffeil"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 #, 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:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Gwall wrth ddarllen o'r gweinydd"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "Methwyd ysgrifennu ffeil %s"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 #, fuzzy
 msgid "Bad header data"
 msgstr "Data pennawd gwael"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Methodd y cysylltiad"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Gwall mewnol"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Methwyd agor pibell ar gyfer %s"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Methwyd gwneud mmap() efo %lu beit"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "Ni ellir agor %s"
 
 # FIXME
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "Methwyd gweithredu "
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Methwyd gwneud mmap() efo %lu beit"
+
+#: apt-pkg/contrib/mmap.cc:311
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Methwyd ysgrifennu ffeil %s"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2400,97 +2417,97 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Ni chanfuwyd y dewis %s"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Talgryniad math anhysbys: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."
 
 # FIXME
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Gwall!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Wedi Gorffen"
 
 # FIXME
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
@@ -2500,358 +2517,376 @@ msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Opsiwn '%s' yn rhy hir"
 
 # FIXME: 'Sense'?
-#: 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 "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Gweithred annilys %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Ni ellir newid i %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Methwyd gwneud stat() o'r CD-ROM"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Methwyd agor y ffeil clo %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Methwyd cael y clo %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, fuzzy, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Arhoswyd am %s ond nid oedd e yna"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Derbyniodd is-broses %s wall segmentu."
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Derbyniodd is-broses %s wall segmentu."
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, 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:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Gorffenodd is-broses %s yn annisgwyl"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Methwyd agor ffeil %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Methwyd agor pibell ar gyfer %s"
 
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Methwyd creu isbroses IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Methwyd gweithredu cywasgydd "
+
 # FIXME
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:1087
+#, 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:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, 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:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Gwall wrth gau'r ffeil"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Gwall wrth gau'r ffeil"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Gwall wrth gyfamseru'r ffeil"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Gwall wrth dadgysylltu'r ffeil"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Gwall wrth gyfamseru'r ffeil"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Storfa pecyn gwag"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Mae'r ffeil storfa pecyn yn llygredig"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
 
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Mae'r ffeil storfa pecyn yn llygredig"
+
 # FIXME: capitalisation?
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:167
 #, fuzzy, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Dibynnu"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "CynDdibynnu"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Awgrymu"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Argymell"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Gwrthdaro"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Amnewid"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Darfodi"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "pwysig"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "angenrheidiol"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "safonnol"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "opsiynnol"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "ychwanegol"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 #, fuzzy
 msgid "Building dependency tree"
 msgstr "Yn Aideladu Coeden Dibyniaeth"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 #, fuzzy
 msgid "Candidate versions"
 msgstr "Fersiynau Posib"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 #, fuzzy
 msgid "Dependency generation"
 msgstr "Cynhyrchaid Dibyniaeth"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 #, fuzzy
 msgid "Reading state information"
 msgstr "Yn cyfuno manylion Ar Gael"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Methwyd agor %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Methwyd ysgrifennu ffeil %s"
 
 # FIXME: number?
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, 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:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, 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:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Methwyd agor ffeil %s"
+
 # FIXME: %s may have an arbirrary length
-#: apt-pkg/packagemanager.cc:456
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2862,19 +2897,12 @@ msgstr ""
 "oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir "
 "eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Ni chynhelir y math ffeil mynegai '%s'"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2882,7 +2910,7 @@ msgstr ""
 "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
 "ei gyfer."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2890,12 +2918,12 @@ msgstr ""
 "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
 "ei achosi gan pecynnau wedi eu dal."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 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:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2904,44 +2932,44 @@ msgstr ""
 "Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
 "rai eu defnyddio yn lle."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, fuzzy, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Yn Darllen Rhestr Ffeiliau"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Methwyd canfod y gyrrydd dull %s."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Ni gychwynodd y dull %s yn gywir"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
@@ -2949,39 +2977,39 @@ msgstr ""
 " '%s'\n"
 "yn y gyrriant '%s' a gwasgwch Enter\n"
 
-#: apt-pkg/init.cc:147
+#: 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:163
+#: apt-pkg/init.cc:167
 #, fuzzy
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Ni ellir canfod math system addas"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Ni ellir gwneud stat() o %s."
 
 # FIXME: ...file
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Methwyd darllen y rhestr ffynhonellau."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, c-format
 msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
@@ -2989,129 +3017,91 @@ msgid ""
 msgstr ""
 
 # FIXME: literal
-#: apt-pkg/policy.cc:389
+#: apt-pkg/policy.cc:396
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
 
 # FIXME: tense
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Methwyd daeall y math pin %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Mae can y storfa system fersiwn anghyfaddas"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei  drin."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 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:386
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Yn Casglu Darpariaethau Ffeil"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "methwyd ailenwi, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "Camgyfatebiaeth swm MD5"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Camgyfatebiaeth swm MD5"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3119,28 +3109,28 @@ msgid ""
 msgstr ""
 
 # FIXME: number?
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3148,13 +3138,13 @@ msgid ""
 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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
 # FIXME: case
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3163,7 +3153,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:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3172,410 +3162,494 @@ 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:1753
+#: apt-pkg/acquire-item.cc:1768
 #, 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:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Camgyfatebiaeth maint"
 
 # FIXME: number?
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, 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:125
+#: apt-pkg/indexrecords.cc:137
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr ""
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "CD Anghywir"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 #, fuzzy
 msgid "Waiting for disc...\n"
 msgstr "Yn aros am benawdau"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 #, fuzzy
 msgid "Copying package lists..."
 msgstr "Yn Darllen Rhestrau Pecynnau"
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 #, fuzzy
 msgid "Writing new source list\n"
 msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Camgyfatebiaeth swm MD5"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Yn Erthylu'r Sefydliad."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Methwyd canfod pecyn %s"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Methwyd canfod pecyn %s"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "  Wedi Sefydlu: "
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Yn cysylltu i %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Methwyd dileu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Methwyd agor ffeil %s"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Wedi Sefydlu: "
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Argymell"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Methwyd dileu %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Methwyd agor ffeil %s"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Caewyd y cysylltiad yn gynnar"
 
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "datgywasgydd"
+
+# FIXME
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "o hyd %lu i ddarllen ond dim ar ôl"
+
+# FIXME
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "o hyd %lu i ysgrifennu ond methwyd"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
+
 #, fuzzy
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Gwall Methwyd, methwyd lleoli aelod"
diff --git a/po/da.po b/po/da.po
index 358e0fe12..16c89a8c5 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-14 12:59+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+0200\n"
 "PO-Revision-Date: 2012-02-04 23:51+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
@@ -19,152 +19,153 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Pakken %s version %s har en uopfyldt afhængighed:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Samlet antal pakkenavne: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Samlet antal pakkestrukturer: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Normale pakker: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Rene virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Enkelte virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Blandede virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Manglende: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Totale forskellige versioner: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Sammenlagt forskellige beskrivelser: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Sammenlagt afhængigheder: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Sammenlagt version/fil-relationer: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Sammenlagt version/fil-relationer: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Sammenlagt 'Tilbyder'-markeringer: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Totalle søgemønsterstrenge: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Total afhængighedsversions-plads: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Total 'Slack'-plads: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Total plads, der kan gøres rede for: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakkefilen %s er ude af trit."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Fandt ingen pakker"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "Du skal angive mindst ét søgemønster"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 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:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, 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:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "'Pinned' pakker:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(ikke fundet)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Installeret: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Pakke-pin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Versionstabel:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3235 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -234,29 +235,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:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 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:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Kunne ikke montere %s til %s"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 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."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Parametre ikke angivet i par"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -284,12 +285,12 @@ msgstr ""
 "  -c=? Læs denne opsætningsfil\n"
 "  -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s er ikke en gyldig DEB-pakke."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -313,40 +314,40 @@ msgstr ""
 "  -c=? Læs denne opsætningsfil\n"
 "  -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1164
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Kunne ikke skrive til %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Kan ikke finde debconfs version. Er debconf installeret?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Pakkeudvidelseslisten er for lang"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Fejl under behandling af mappen %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Kildeudvidelseslisten er for lang"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Fejl under skrivning af hovedet til indholdsfil"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Fejl under behandling af indhold %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -426,26 +427,26 @@ msgstr ""
 "  -c=?  Læs denne opsætningsfil\n"
 "  -o=?  Sæt en opsætnings-indstilling"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Ingen valg passede"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Visse filer mangler i pakkefilgruppen '%s'"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "DB var ødelagt, filen omdøbt til %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB er gammel, forsøger at opgradere %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -453,112 +454,112 @@ msgstr ""
 "Databaseformatet er ugyldigt. Hvis du har opgraderet fra en ældre version af "
 "apt, så fjern og genskab databasen."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Kunne ikke åbne DB-filen %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Kunne ikke finde %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Arkivet har ingen kontrolindgang"
 
-#: ftparchive/cachedb.cc:452
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Kunne skaffe en markør"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A: Kunne ikke læse mappen %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Kunne ikke finde %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "F: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "A: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "F: Fejlene vedrører filen "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Kunne ikke omsætte navnet %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Trævandring mislykkedes"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Kunne ikke åbne %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Kunne ikke 'readlink' %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Kunne ikke frigøre %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Kunne ikke lænke %s til %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Nåede DeLink-begrænsningen på %sB.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Arkivet havde intet package-felt"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s har ingen tvangs-post\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  pakkeansvarlig for %s er %s, ikke %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, 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:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
 "  %s har ingen linje med tilsidesættelse af standard for binøre filer\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Kunne ikke allokere hukommelse"
 
@@ -568,18 +569,18 @@ msgid "Unable to open %s"
 msgstr "Kunne ikke åbne %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Ugyldig gennemtvangs %s-linje %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Ugyldig gennemtvangs %s-linje %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Ugyldig gennemtvangs %s-linje %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -587,63 +588,51 @@ msgstr "Ugyldig gennemtvangs %s-linje %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "Kunne ikke læse gennemtvangsfilen %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Ukendt komprimeringsalgoritme '%s'"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Komprimerede uddata %s kræver et komprimeringssæt"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Kunne ikke oprette IPC-videreførsel til underproces"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Kunne ikke oprette FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Kunne ikke spalte"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Komprimer barn"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Intern fejl. Kunne ikke oprette %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Kunne ikke oprette underproces IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Kunne ikke udføre komprimeringsprogram "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "dekomprimerings-program"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "IO til underproces/fil mislykkedes"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Kunne ikke læse under beregning af MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Problem under aflænkning af %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Kunne ikke omdøbe %s til %s"
@@ -652,75 +641,79 @@ msgstr "Kunne ikke omdøbe %s til %s"
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Fejl ved tolkning af regulært udtryk - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Følgende pakker har uopfyldte afhængigheder:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "men %s er installeret"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "men %s forventes installeret"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "men den kan ikke installeres"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "men det er en virtuel pakke"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "men den er ikke installeret"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "men den bliver ikke installeret"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " eller"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Følgende NYE pakker vil blive installeret:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Følgende pakker vil blive AFINSTALLERET:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Følgende pakker er blevet holdt tilbage:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Følgende pakker vil blive opgraderet:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Følgende pakker vil blive NEDGRADERET:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Følgende tilbageholdte pakker vil blive ændret:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (grundet %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -728,59 +721,59 @@ msgstr ""
 "ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n"
 "Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu opgraderes, %lu nyinstalleres, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu geninstalleres, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderes, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Bemærk, vælger '%s' til opgave '%s'\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Bemærk, vælger '%s' for regulært udtryk '%s'\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Pakken %s er en virtuel pakke, der kan leveres af:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Installeret]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr " [Ingen kandidatversion]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Du bør eksplicit vælge en at installere."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -791,181 +784,181 @@ msgstr ""
 "anden pakke. Det kan betyde at denne pakke blevet overflødiggjort eller \n"
 "kun kan hentes fra andre kilder\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Dog kan følgende pakker erstatte den:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Pakken '%s' har ingen installationskandidat"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "Virtuelle pakker som '%s' kan ikke fjernes\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Bemærk, vælger '%s' fremfor '%s'\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Overspringer %s, da den allerede er installeret og opgradering er "
 "deaktiveret.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Overspringer %s, den er ikke installeret og der er kun forespurgt efter "
 "opgraderinger.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s er i forvejen den nyeste version.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2096 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s sat til manuelt installeret.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Valgte version '%s' (%s) for '%s'\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Valgte version '%s' (%s) for '%s' på grund af '%s'\n"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Pakken %s er ikke installeret, så den afinstalleres ikke\n"
 
-#: cmdline/apt-get.cc:969
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Retter afhængigheder..."
 
-#: cmdline/apt-get.cc:972
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " mislykkedes."
 
-#: cmdline/apt-get.cc:975
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Kunne ikke rette afhængigheder"
 
-#: cmdline/apt-get.cc:978
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Kunne ikke minimere opgraderingssættet"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Færdig"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Du kan muligvis rette dette ved at køre 'apt-get -f install'."
 
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Uopfyldte afhængigheder. Prøv med -f."
 
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ADVARSEL: Følgende pakkers autenticitet kunne ikke verificeres!"
 
-#: cmdline/apt-get.cc:1016
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Autentifikationsadvarsel tilsidesat.\n"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Installér disse pakker uden verifikation (y/N)? "
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Nogle pakker kunne ikke autentificeres"
 
-#: cmdline/apt-get.cc:1034 cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Der er problemer og -y blev brugt uden --force-yes"
 
-#: cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!"
 
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern fejl. Sortering blev ikke fuldført"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "Mystisk.. Størrelserne passede ikke, skriv til apt@packages.debian.org"
 
 #. 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:1140
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "%sB/%sB skal hentes fra 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:1145
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "%sB skal hentes fra 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:1152
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Efter denne handling, vil %sB yderligere diskplads være brugt.\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:1157
+#: cmdline/apt-get.cc:1173
 #, c-format
 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:1172 cmdline/apt-get.cc:1175 cmdline/apt-get.cc:2514
-#: cmdline/apt-get.cc:2517
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kunne ikke bestemme ledig plads i %s"
 
-#: cmdline/apt-get.cc:1185
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Du har ikke nok ledig plads i %s."
 
-#: cmdline/apt-get.cc:1201 cmdline/apt-get.cc:1221
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "'Trivial Only' angivet, men dette er ikke en triviel handling."
 
-#: cmdline/apt-get.cc:1203
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Ja, gør som jeg siger!"
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -976,28 +969,28 @@ msgstr ""
 "For at fortsætte, skal du skrive '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1211 cmdline/apt-get.cc:1230
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Afbryder."
 
-#: cmdline/apt-get.cc:1226
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du fortsætte [J/n]? "
 
-#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:2579 apt-pkg/algorithms.cc:1445
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Kunne ikke hente %s %s\n"
 
-#: cmdline/apt-get.cc:1316
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Nedhentningen af filer mislykkedes"
 
-#: cmdline/apt-get.cc:1317 cmdline/apt-get.cc:2591
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
 
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1005,19 +998,19 @@ msgstr ""
 "Kunne ikke hente nogle af arkiverne. Prøv evt. at køre 'apt-get update' "
 "eller prøv med --fix-missing."
 
-#: cmdline/apt-get.cc:1327
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing og medieskift understøttes endnu ikke"
 
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Kunne ikke rette manglende pakker."
 
-#: cmdline/apt-get.cc:1333
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Afbryder installationen."
 
-#: cmdline/apt-get.cc:1361
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1031,37 +1024,37 @@ msgstr[1] ""
 "De følgende pakker forsvandt fra dit system, da\n"
 "alle filer er blevet overskrevet af andre pakker:"
 
-#: cmdline/apt-get.cc:1365
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Bemærk: Dette sker automatisk og med vilje af dpkg."
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Ignorer utilgængelig måludgivelse '%s' af pakke '%s'"
 
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Vælger '%s' som kildepakke fremfor '%s'\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1573
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Ignorer utilgængelig version '%s' af pakke '%s'"
 
-#: cmdline/apt-get.cc:1589
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "'update'-kommandoen benytter ingen parametre"
 
-#: cmdline/apt-get.cc:1652
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Det er ikke meningen, at vi skal slette ting og sager, kan ikke starte "
 "AutoRemover"
 
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1079,15 +1072,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1759 cmdline/apt-get.cc:1929
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:"
 
-#: cmdline/apt-get.cc:1763
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern fejl. AutoRemover ødelagde noget"
 
-#: cmdline/apt-get.cc:1770
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1098,7 +1091,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Følgende pakker blev installeret automatisk, og behøves ikke længere:"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1107,19 +1100,19 @@ msgstr[0] "Pakken %lu blev installeret automatisk, og behøves ikke længere.\n"
 msgstr[1] ""
 "Pakkerne %lu blev installeret automatisk, og behøves ikke længere.\n"
 
-#: cmdline/apt-get.cc:1776
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Brug 'apt-get autoremove' til at fjerne dem."
 
-#: cmdline/apt-get.cc:1795
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern fejl, AllUpgrade ødelagde noget"
 
-#: cmdline/apt-get.cc:1894
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Du kan muligvis rette det ved at køre 'apt-get -f install':"
 
-#: cmdline/apt-get.cc:1898
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1127,7 +1120,7 @@ msgstr ""
 "Uopfyldte afhængigheder. Prøv 'apt-get -f install' uden pakker (eller angiv "
 "en løsning)."
 
-#: cmdline/apt-get.cc:1914
+#: cmdline/apt-get.cc:1929
 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"
@@ -1138,33 +1131,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:1932
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Ødelagte pakker"
 
-#: cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Følgende yderligere pakker vil blive installeret:"
 
-#: cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Foreslåede pakker:"
 
-#: cmdline/apt-get.cc:2049
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Anbefalede pakker:"
 
-#: cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kunne ikke finde pakken %s"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s sat til automatisk installation.\n"
 
-#: cmdline/apt-get.cc:2106 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -1172,41 +1165,41 @@ msgstr ""
 "Denne kommando er forældet. Brug venligst »apt-mark auto« og »apt-mark "
 "manual« i stedet for."
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Beregner opgraderingen... "
 
-#: cmdline/apt-get.cc:2125 methods/ftp.cc:708 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Mislykkedes"
 
-#: cmdline/apt-get.cc:2130
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Færdig"
 
-#: cmdline/apt-get.cc:2197 cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern fejl. Problemløseren ødelagde noget"
 
-#: cmdline/apt-get.cc:2233 cmdline/apt-get.cc:2269
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Kunne ikke låse nedhentningsmappen"
 
-#: cmdline/apt-get.cc:2320
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr "Henter %s %s"
 
-#: cmdline/apt-get.cc:2376
+#: cmdline/apt-get.cc:2396
 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:2416 cmdline/apt-get.cc:2728
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kunne ikke finde kildetekstpakken for %s"
 
-#: cmdline/apt-get.cc:2433
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1215,7 +1208,7 @@ msgstr ""
 "BEMÆRK: Pakning af '%s' vedligeholdes i versionskontrolsystemet '%s' på:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2438
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1226,68 +1219,68 @@ msgstr ""
 "bzr get %s\n"
 "for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n"
 
-#: cmdline/apt-get.cc:2491
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Overspringer allerede hentet fil '%s'\n"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2548
 #, 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:2537
+#: cmdline/apt-get.cc:2557
 #, 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:2542
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
 
-#: cmdline/apt-get.cc:2548
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Henter kildetekst %s\n"
 
-#: cmdline/apt-get.cc:2586
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Nogle arkiver kunne ikke hentes."
 
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2637
 #, 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:2629
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Udpakningskommandoen '%s' fejlede.\n"
 
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2650
 #, 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:2652
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Opbygningskommandoen '%s' fejlede.\n"
 
-#: cmdline/apt-get.cc:2672
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Barneprocessen fejlede"
 
-#: cmdline/apt-get.cc:2691
+#: cmdline/apt-get.cc:2711
 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:2716
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -1296,17 +1289,17 @@ msgstr ""
 "Ingen arkitekturinformation tilgængelig for %s. Se apt.conf(5) APT::"
 "Architectures for opsætning"
 
-#: cmdline/apt-get.cc:2733
+#: cmdline/apt-get.cc:2753
 #, 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:2753
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen opbygningsafhængigheder.\n"
 
-#: cmdline/apt-get.cc:2883
+#: cmdline/apt-get.cc:2903
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1314,7 +1307,7 @@ msgid ""
 msgstr ""
 "Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt på '%s'"
 
-#: cmdline/apt-get.cc:2904
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1322,14 +1315,14 @@ msgid ""
 msgstr ""
 "Afhængigheden %s for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
 
-#: cmdline/apt-get.cc:2927
+#: cmdline/apt-get.cc:2947
 #, 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:2966
+#: cmdline/apt-get.cc:2986
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1338,7 +1331,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:2972
+#: cmdline/apt-get.cc:2992
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1347,30 +1340,30 @@ msgstr ""
 "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke har en "
 "kandidatversion"
 
-#: cmdline/apt-get.cc:2995
+#: cmdline/apt-get.cc:3015
 #, 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:3011
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes."
 
-#: cmdline/apt-get.cc:3016
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Kunne ikke behandler opbygningsafhængighederne"
 
-#: cmdline/apt-get.cc:3109 cmdline/apt-get.cc:3121
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Ændringslog for %s (%s)"
 
-#: cmdline/apt-get.cc:3240
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Understøttede moduler:"
 
-#: cmdline/apt-get.cc:3281
+#: cmdline/apt-get.cc:3301
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1458,7 +1451,7 @@ msgstr ""
 "for flere oplysninger og tilvalg.\n"
 "                       Denne APT har »Super Cow Powers«.\n"
 
-#: cmdline/apt-get.cc:3444
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1470,33 +1463,33 @@ msgstr ""
 "    Husk også at låsning er deaktiveret,\n"
 "    så stol ikke på relevansen for den reelle aktuelle situation!"
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Havde "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Henter:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ignorerer "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Fejl "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Hentede %sB på %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Arbejder]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1507,46 +1500,62 @@ msgstr ""
 " '%s'\n"
 "i drevet '%s' og tryk retur\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s kan ikke markeres, da den ikke er installeret.\n"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s var allerede sat til manuelt installeret.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s var allerede sat til automatisk installeret.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s var allerede sat i bero.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s var allerede ikke i bero.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s sat i bero.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Afbrød i bero for %s.\n"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr "Kørsel af dpkg fejlede. Er du root (administrator)?"
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1588,11 +1597,11 @@ msgstr ""
 "tmp\n"
 "Se manualsiderne apt-mark(8) og apt.conf(5) for yderligere information."
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Ukendt pakkeindgang!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1655,196 +1664,198 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Sammenfletter tilgængelighedsoplysninger"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Kunne ikke oprette videreførsler"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Kunne ikke udføre gzip "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Ødelagt arkiv"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar-tjeksum fejlede, arkivet er ødelagt"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Ukendt TAR-hovedtype %u, element %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Ugyldig arkivsignatur"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Fejl under læsning af arkivelements hoved"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "Ugyldigt arkivelementhoved %s"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Ugyldigt arkivelementhoved"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Arkivet er for kort"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Kunne ikke læse arkivhovederne"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "DropNode kaldt med endnu forbundet knude"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Kunne ikke finde hash-element!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Kunne ikke allokere omrokering"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Intern fejl i AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Forsøger at overskrive en omrokering, %s -> %s og %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Dobbelt tilføjelse af omrokering %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Dobbelt opsætningsfil %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Kunne ikke skrive filen %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Kunne ikke lukke filen %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Stien %s er for lang"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Pakkede %s ud flere gange"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Mappen %s er omrokeret"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Omrokeringsstien er for lang"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "Kunne ikke finde knuden i sin hash-bucket"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Stien er for lang"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Overskriv pakkematch uden version for %s"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "File %s/%s overskriver filen i pakken %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:454 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:353
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kunne ikke læse %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Kunne ikke finde %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Kunne ikke slette %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Kunne ikke oprette %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Kunne ikke finde %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Mapperne info og temp skal ligge i samme filsystem"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1063
-#: apt-pkg/pkgcachegen.cc:1167 apt-pkg/pkgcachegen.cc:1173
-#: apt-pkg/pkgcachegen.cc:1335
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Indlæser pakkelisterne"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Kunne ikke skifte til admin-mappen %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Intern fejl under hentning af et pakkenavn"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Læser fillisten"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1855,115 +1866,116 @@ msgstr ""
 "kan du gøre dem tom og med det samme geninstallere den samme version af "
 "pakken!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Kunne ikke læse listefilen %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Intern fejl under hentning af knude"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Kunne ikke åbne omrokeringsfilen %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "Pakkeomrokeringsfilen er ødelagt"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Ugyldig linje i omrokeringsfilen: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Intern fejl under tilføjelse af omrokering"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "pkg-mellemlageret skal initialiseres først"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Kunne ikke finde et Package:-hovede, forskydning %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Ugyldig ConfFile-afsnit i statusfilen. Forskydning %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Fejl under tolkning af MD5. Forskydning %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Dette er ikke et gyldigt DEB-arkiv, mangler '%s'-elementet"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 "Dette er ikke et gyldigt DEB-arkiv, det har intet '%s', '%s' eller '%s'-"
 "element"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Kunne ikke skifte til %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Intern fejl, kunne ikke finde elementet %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Kunne ikke finde en gyldig kontrolfil"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Ikke-tolkbar kontrolfil"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr "Tomme filer kan ikke være gyldige arkiver"
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Kunne ikke åbne datarør for %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Læsefejl fra %s-process"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:527
-#: methods/rred.cc:536
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Kunne ikke finde"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:533
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Kunne ikke angive ændringstidspunkt"
 
-#: methods/cdrom.cc:200
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Kunne ikke læse cdrom-databasen %s"
 
-#: methods/cdrom.cc:209
+#: 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"
@@ -1971,56 +1983,56 @@ msgstr ""
 "Brug apt-cdrom for at apt kan lære den at kende. apt-get update kan ikke "
 "bruges til at tilføje nye cd'er"
 
-#: methods/cdrom.cc:219
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "Forkert cd"
 
-#: methods/cdrom.cc:246
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Kunne ikke afmontere cdrommen i %s, den er muligvis stadig i brug."
 
-#: methods/cdrom.cc:251
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Disk blev ikke fundet."
 
-#: methods/cdrom.cc:259 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Fil blev ikke fundet"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Ugyldig URI, lokale URI'er må ikke starte med //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:169
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Logget på"
 
-#: methods/ftp.cc:175
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Kunne ikke bestemme serverens navn"
 
-#: methods/ftp.cc:180
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Kunne ikke bestemme det lokale navn"
 
-#: methods/ftp.cc:211 methods/ftp.cc:239
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Serveren nægtede os forbindelse og sagde: %s"
 
-#: methods/ftp.cc:217
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "angivelse af brugernavn mislykkedes, serveren sagde: %s"
 
-#: methods/ftp.cc:224
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "angivelse af adgangskode mislykkedes, serveren sagde: %s"
 
-#: methods/ftp.cc:244
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2028,198 +2040,198 @@ msgstr ""
 "Der blev angivet en proxyserver men intet logpå-skript; Acquire::ftp::"
 "ProxyLogin er tom."
 
-#: methods/ftp.cc:272
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Logpå-skriptets kommando '%s' mislykkedes. Serveren sagde: %s"
 
-#: methods/ftp.cc:298
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE mislykkedes. Serveren sagde: %s"
 
-#: methods/ftp.cc:336 methods/ftp.cc:447 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Tidsudløb på forbindelsen"
 
-#: methods/ftp.cc:342
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Serveren lukkede forbindelsen"
 
-#: methods/ftp.cc:345 apt-pkg/contrib/fileutl.cc:831 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Læsefejl"
 
-#: methods/ftp.cc:352 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Mellemlageret blev overfyldt af et svar."
 
-#: methods/ftp.cc:369 methods/ftp.cc:381
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Protokolfejl"
 
-#: methods/ftp.cc:453 apt-pkg/contrib/fileutl.cc:873 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Skrivefejl"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Kunne ikke oprette sokkel"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "Kunne ikke forbinde datasokkel, tidsudløb på forbindelsen"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Kunne ikke forbinde passiv sokkel."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo kunne ikke få en lyttesokkel"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Kunne ikke tilknytte en sokkel"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Kunne ikke lytte på soklen"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Kunne ikke finde soklens navn"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Kunne ikke sende PORT-kommando"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Ukendt adressefamilie %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT mislykkedes. Serveren sagde: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Tidsudløb på datasokkel-forbindelse"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Kunne ikke acceptere forbindelse"
 
-#: methods/ftp.cc:870 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Problem ved \"hashing\" af fil"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Kunne ikke hente fil. Serveren sagde '%s'"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Tidsudløb ved datasokkel"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Dataoverførsel mislykkedes, serveren sagde '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Forespørgsel"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Kunne ikke udføre "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Forbinder til %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Kan ikke oprette forbindelse til %s:%s (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Forbinder til %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Kunne ikke omsætte navnet '%s'"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Midlertidig fejl ved omsætning af navnet '%s'"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, 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:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Kunne ikke forbinde til %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Stødte på mindst én ugyldig signatur."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Ukendt fejl ved kørsel af gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Følgende signaturer var ugyldige:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2227,107 +2239,112 @@ msgstr ""
 "Følgende signaturer kunne ikke verificeret, da den offentlige nøgle ikke er "
 "tilgængelig:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Afventer hoveder"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Fandt en enkelt linje i hovedet på over %u tegn"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Ugyldig linje i hovedet"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http-serveren sendte et ugyldigt svarhovede"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http-serveren sendte et ugyldigt Content-Length-hovede"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http-serveren sendte et ugyldigt Content-Range-hovede"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr ""
 "Denne http-servere har fejlagtig understøttelse af intervaller ('ranges')"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Ukendt datoformat"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Valg mislykkedes"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Tidsudløb på forbindelsen"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Fejl ved skrivning af uddatafil"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Fejl ved skrivning til fil"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Fejl ved skrivning til filen"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Fejl ved læsning fra server"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Kunne ikke afkorte filen"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Ugyldige hoved-data"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkedes"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Intern fejl"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Kan ikke udføre mmap for en tom fil"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Kunne ikke duplikere filbeskrivelse %i"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Kunne ikke udføre mmap for %lu byte"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "Kunne ikke lukke mmap"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "Kunne ikke synkronisere mmap"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Kunne ikke udføre mmap for %lu byte"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Kunne ikke afkorte filen"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2336,7 +2353,7 @@ msgstr ""
 "Dynamisk MMap løb tør for plads. Øg venligst størrelsen på APT::Cache-Limit. "
 "Aktuel værdi: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2345,7 +2362,7 @@ msgstr ""
 "Kunne ikke øge størrelsen på MMap da begrænsningen på %lu byte allerede er "
 "nået."
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2376,432 +2393,445 @@ msgstr "%limin %lis"
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1137
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Det valgte %s blev ikke fundet"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Ukendt type-forkortelse: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Åbner konfigurationsfilen %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaksfejl %s:%u: Blokken starter uden navn."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntaksfejl %s:%u: Forkert udformet mærke"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntaksfejl %s:%u: Overskydende affald efter værdien"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Syntaksfejl %s:%u: Direktiver kan kun angives i topniveauet"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntaksfejl %s:%u: For mange sammenkædede inkluderinger"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntaksfejl %s:%u: Inkluderet herfra"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaksfejl %s:%u: Ikke-understøttet direktiv '%s'"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr "Syntaksfejl %s:%u: ryd direktiv kræver et tilvalgstræ som argument"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntaksfejl %s:%u: Overskydende affald i slutningen af filen"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Fejl!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Færdig"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Kommandolinjetilvalget '%c' [fra %s] kendes ikke."
 
-#: apt-pkg/contrib/cmndline.cc:101 apt-pkg/contrib/cmndline.cc:109
-#: apt-pkg/contrib/cmndline.cc:117
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Kommandolinjetilvalget %s blev ikke forstået"
 
-#: apt-pkg/contrib/cmndline.cc:122
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Kommandolinjetilvalget %s er ikke boolsk"
 
-#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Tilvalget %s kræver et parameter."
 
-#: apt-pkg/contrib/cmndline.cc:197 apt-pkg/contrib/cmndline.cc:203
+#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Tilvalg %s: Opsætningspostens specifikation skal have en =<værdi>."
 
-#: apt-pkg/contrib/cmndline.cc:232
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Tilvalget %s kræver et heltalligt parameter, ikke '%s'"
 
-#: apt-pkg/contrib/cmndline.cc:263
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Tilvalget '%s' er for langt"
 
-#: apt-pkg/contrib/cmndline.cc:295
+#: apt-pkg/contrib/cmndline.cc:298
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr "%s blev ikke forstået, prøv med 'true' eller 'false'."
 
-#: apt-pkg/contrib/cmndline.cc:345
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Ugyldig handling %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Kunne ikke finde monteringspunktet %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:460 apt-pkg/acquire.cc:485 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Kunne ikke skifte til %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Kunne ikke finde cdrommen"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Kunne ikke åbne låsefilen %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Kunne ikke opnå låsen %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, 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:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, 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:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, 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:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, 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:690
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Ventede på %s, men den var der ikke"
 
-#: apt-pkg/contrib/fileutl.cc:702
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprocessen %s modtog en segmenteringsfejl."
 
-#: apt-pkg/contrib/fileutl.cc:704
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Underprocessen %s modtog en signal %u."
 
-#: apt-pkg/contrib/fileutl.cc:708
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprocessen %s returnerede en fejlkode (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:710
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprocessen %s afsluttedes uventet"
 
-#: apt-pkg/contrib/fileutl.cc:775 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Kunne ikke åbne filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:792
+#: apt-pkg/contrib/fileutl.cc:923
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Kunne ikke åbne filbeskrivelse %d"
 
-#: apt-pkg/contrib/fileutl.cc:852
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Kunne ikke oprette underproces IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Kunne ikke udføre komprimeringsprogram "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "læs, mangler stadig at læse %lu men der er ikke flere"
 
-#: apt-pkg/contrib/fileutl.cc:885
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "skriv, mangler stadig at skrive %lu men kunne ikke"
 
-#: apt-pkg/contrib/fileutl.cc:1021
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problem under lukning af gzip-filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1024
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem under lukning af filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1419
 #, 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:1040
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Fejl ved frigivelse af filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1053
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Problem under synkronisering af fil"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Tomt pakke-mellemlager"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Pakke-mellemlagerets fil er ødelagt"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "Pakke-mellemlagerets fil er af en inkompatibel version"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Pakke-mellemlagerets fil er ødelagt"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Denne APT understøtter ikke versionssystemet '%s'"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "Pakke-mellemlageret er lavet til en anden arkitektur"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Afhængigheder"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Præ-afhængigheder"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Foreslåede"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Anbefalede"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Konflikter"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Erstatter"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Overflødiggør"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Ødelægger"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "Forbedringer"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "vigtig"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "krævet"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "frivillig"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "ekstra"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Opbygger afhængighedstræ"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Kandidatversioner"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Afhængighedsgenerering"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Læser tilstandsoplysninger"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Kunne ikke åbne StateFile %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Kunne ikke skrive den midlertidige StateFile %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Kunne ikke tolke pakkefilen %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Kunne ikke tolke pakkefilen %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] kunne ikke fortolkes)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] for kort)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Ugyldig linje %lu i kildelisten %s ([%s] er ikke en opgave)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Ugyldig linje %lu i kildelisten %s ([%s] har ingen nøgle)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "Ugyldig linje %lu i kildelisten %s ([%s] nøgle %s har ingen værdi)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Ugyldig linje %lu i kildelisten %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Ugyldig linje %lu i kildelisten %s (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Åbner %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Linjen %u er for lang i kildelisten %s."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Ugyldig linje %u i kildelisten %s (type)"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:645
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2810,7 +2840,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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Kunne ikke åbne filen '%s'"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2822,28 +2857,19 @@ msgstr ""
 "idé, men hvis du virkelig vil gøre det, kan du aktivere valget 'APT::Force-"
 "LoopBreak'."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"Kunne ikke udføre øjeblikkelig konfiguration på allerede udpakket '%s'. Se "
-"venligst man 5 apt.conf under APT:Immediate-Cinfigure for detaljer."
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Indeksfiler af typen '%s' understøttes ikke"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 "Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2851,12 +2877,12 @@ msgstr ""
 "Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes "
 "tilbageholdte pakker."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 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:1471 apt-pkg/algorithms.cc:1473
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2864,79 +2890,79 @@ msgstr ""
 "Nogle indeksfiler kunne ikke hentes. De er blevet ignoreret eller de gamle "
 "bruges i stedet."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Listemappen %spartial mangler."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Arkivmappen %spartial mangler."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "Kunne ikke låse mappen %s"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:861
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Henter fil %li ud af %li (%s tilbage)"
 
-#: apt-pkg/acquire.cc:863
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Henter fil %li ud af %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Metodedriveren %s blev ikke fundet."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s startede ikke korrekt"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:146
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Pakkesystemet '%s' understøttes ikke"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Kunne ikke bestemme en passende pakkesystemtype"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Kunne ikke finde %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Du skal have nogle 'source'-URI'er i din sources.list"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Pakkelisterne eller statusfilen kunne ikke tolkes eller åbnes."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Du kan muligvis rette problemet ved at køre 'apt-get update'"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Listen med kilder kunne ikke læses."
 
-#: apt-pkg/policy.cc:72
+#: apt-pkg/policy.cc:74
 #, c-format
 msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
@@ -2945,126 +2971,88 @@ msgstr ""
 "Værdien »%s« er ugyldig for APT::Default-Release da sådan en udgivelse ikke "
 "er tilgængelig i kilderne"
 
-#: apt-pkg/policy.cc:390
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Ugyldig indgang i indstillingsfilen %s, pakkehovedet mangler"
 
-#: apt-pkg/policy.cc:412
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Kunne ikke forstå pin-type %s"
 
-#: apt-pkg/policy.cc:420
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Mellemlageret benytter en inkompatibel versionsstyring"
 
-#: apt-pkg/pkgcachegen.cc:190
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Der skete en fejl under behandlingen af %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:207
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:245
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Der skete en fejl under behandlingen af %s (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:277
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:281
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:298 apt-pkg/pkgcachegen.cc:308
-#: apt-pkg/pkgcachegen.cc:316
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Der skete en fejl under behandlingen af %s (NewVersion%d)"
-
-#: apt-pkg/pkgcachegen.cc:312
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:345
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Der skete en fejl under behandlingen af %s (NewFileDesc2)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Der skete en fejl under behandlingen af %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Hold da op! Du nåede over det antal pakkenavne, denne APT kan håndtere."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere."
 
-#: apt-pkg/pkgcachegen.cc:360
+#: apt-pkg/pkgcachegen.cc:243
 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:389
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Der skete en fejl under behandlingen af %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:403
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:975
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Kunne ikke finde kildepakkelisten %s"
 
-#: apt-pkg/pkgcachegen.cc:1080
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Samler filudbud"
 
-#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1281
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "IO-fejl ved gemning af kilde-mellemlageret"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "omdøbning mislykkedes, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum stemmer ikke"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1847
-#: apt-pkg/acquire-item.cc:1990
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Hashsum stemmer ikke"
 
-#: apt-pkg/acquire-item.cc:1387
+#: apt-pkg/acquire-item.cc:1399
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3073,17 +3061,17 @@ msgstr ""
 "Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-"
 "punkt eller forkert udformet fil)"
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1438
+#: apt-pkg/acquire-item.cc:1450
 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:1476
+#: apt-pkg/acquire-item.cc:1488
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3092,12 +3080,12 @@ msgstr ""
 "Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette "
 "arkiv vil ikke blive anvendt."
 
-#: apt-pkg/acquire-item.cc:1498
+#: apt-pkg/acquire-item.cc:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konfliktdistribution: %s (forventede %s men fik %s)"
 
-#: apt-pkg/acquire-item.cc:1531
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3107,12 +3095,12 @@ msgstr ""
 "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:1541 apt-pkg/acquire-item.cc:1546
+#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-fejl: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1638
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3121,7 +3109,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:1697
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3130,47 +3118,47 @@ 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:1752
+#: apt-pkg/acquire-item.cc:1768
 #, 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:1839
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Størrelsen stemmer ikke"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Kunne ikke fortolke udgivelsesfil %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Ingen afsnit i udgivelsesfil %s"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Intet hashpunkt i udgivelsesfil %s"
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Ugyldigt punkt 'Valid-Until' i udgivelsesfil %s"
 
-#: apt-pkg/indexrecords.cc:129
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ugyldigt punkt 'Date' i udgivelsesfil %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Leverandørblok %s inderholder intet fingeraftryk"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3179,41 +3167,41 @@ msgstr ""
 "Bruger cdrom-monteringspunktet %s\n"
 "Monterer cdrom\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Identificerer.. "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Gemt mærkat: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "Afmonterer cdrom...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Bruger cdrom-monteringspunktet %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Afmonterer cdrom\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Venter på disken...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Monterer cdrom...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Skanner disken for indeksfiler..\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3222,7 +3210,7 @@ msgstr ""
 "Fandt %zu pakkeindekser, %zu kildeindekser, %zu oversættelsesindekser og %zu "
 "signaturer\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3230,16 +3218,16 @@ msgstr ""
 "Kunne ikke finde nogen pakkefiler, det er muligvis ikke en Debiandisk eller "
 "den forkerte arkitektur?"
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Fandt mærkatet '%s'\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Det er ikke et gyldigt navn, prøv igen.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3248,90 +3236,90 @@ msgstr ""
 "Denne disk hedder: \n"
 " %s \n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Kopierer pakkelisterne..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Skriver ny kildeliste\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "Denne disk har følgende kildeliste-indgange:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:927
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:929
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skrev %i poster med %i manglende filer.\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:935
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, 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"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Springer ikkeeksisterende fil over %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Kan ikke finde godkendelsesregistrering for: %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hashsum stemmer ikke: %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "Ingen nøglering installeret i %s."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Udgaven '%s' for '%s' blev ikke fundet"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versionen '%s' for '%s' blev ikke fundet"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Kunne ikke finde opgaven '%s'"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Kunne ikke finde nogle pakker med regulært udtryk '%s'"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "Kan ikke vælge versioner fra pakke '%s' som er vitalt"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3340,123 +3328,147 @@ msgstr ""
 "Kan ikke vælge installeret eller kandidatversion fra pakke '%s' da den ikke "
 "har nogen af dem"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr "Kan ikke vælge nyeste version fra pakke '%s' som er vital"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Kan ikke vælge kandidatversion fra pakke %s da den ikke har nogen kandidat"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Kan ikke vælge installeret version fra pakke %s da den ikke er installeret"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "Installerer %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Sætter %s op"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Fjerner %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "Fjerner %s helt"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Bemærker forsvinding af %s"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Mappe '%s' mangler"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Kunne ikke åbne filen '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Klargør %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Pakker %s ud"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Gør klar til at sætte %s op"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "Installerede %s"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Gør klar til afinstallation af %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "Fjernede %s"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Gør klar til at fjerne %s helt"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "Fjernede %s helt"
 
-#: apt-pkg/deb/dpkgpm.cc:1087
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1118
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "Kører dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1344
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1349
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "afhængighedsproblemer - efterlader ukonfigureret"
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3464,14 +3476,14 @@ msgstr ""
 "Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en "
 "opfølgningsfejl fra en tidligere fejl."
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 "Ingen apportrapport skrevet da fejlbeskeden indikerer en fuld disk-fejl"
 
-#: apt-pkg/deb/dpkgpm.cc:1363
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3479,12 +3491,12 @@ msgstr ""
 "Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok "
 "hukommelsesfejl"
 
-#: apt-pkg/deb/dpkgpm.cc:1370
+#: apt-pkg/deb/dpkgpm.cc:1434
 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"
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3492,43 +3504,43 @@ msgid ""
 msgstr ""
 "Kunne ikke låse administrationsmappen (%s), bruger en anden proces den?"
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Kunne ikke låse administrationsmappen (%s), er du rod (root)?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr "dpkg blev afbrudt, du skal manuelt køre '%s' for at rette problemet."
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Ikke låst"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "Ingen spejlfil »%s« fundet "
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Kan ikke læse spejlfil »%s«"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Spejl: %s]"
 
-#: methods/rred.cc:506
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3537,7 +3549,7 @@ msgstr ""
 "Kunne ikke fejlrette (patch) %s med mmap og med filhandlingsbrug - "
 "fejlrettelsen ser ud til at være ødelagt."
 
-#: methods/rred.cc:511
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3546,6 +3558,64 @@ msgstr ""
 "Kunne ikke fejlrette (patch) %s med mmap (men ingen mmap specifik fejl) - "
 "fejlrettelsen ser ud til at være ødelagt."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Forbindelsen lukkedes for hurtigt"
+
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Bemærk: Dette sker automatisk og med vilje af dpkg."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Ugyldig gennemtvangs %s-linje %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Ugyldig gennemtvangs %s-linje %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Ugyldig gennemtvangs %s-linje %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "dekomprimerings-program"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "læs, mangler stadig at læse %lu men der er ikke flere"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "skriv, mangler stadig at skrive %lu men kunne ikke"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "Kunne ikke udføre øjeblikkelig konfiguration på allerede udpakket '%s'. "
+#~ "Se venligst man 5 apt.conf under APT:Immediate-Cinfigure for detaljer."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Der skete en fejl under behandlingen af %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Der skete en fejl under behandlingen af %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Der skete en fejl under behandlingen af %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Der skete en fejl under behandlingen af %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Der skete en fejl under behandlingen af %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)"
diff --git a/po/de.po b/po/de.po
index c19d010fd..c97ef3744 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.8\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+0200\n"
 "PO-Revision-Date: 2010-11-15 21:42+0100\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -20,149 +20,150 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);>\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paket %s Version %s hat eine unerfüllte Abhängigkeit:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Gesamtzahl an Paketnamen: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Gesamtzahl an Paketstrukturen: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  davon gewöhnliche Pakete: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  davon rein virtuelle Pakete: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  davon einzelne virtuelle Pakete: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  davon gemischte virtuelle Pakete: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  davon fehlend: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Gesamtzahl an unterschiedlichen Versionen: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Gesamtzahl an unterschiedlichen Beschreibungen: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Gesamtzahl an Abhängigkeiten: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Gesamtzahl an Version/Datei-Beziehungen: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Gesamtzahl an Beschreibung/Datei-Beziehungen: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Gesamtzahl an Bereitstellungen: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Gesamtzahl an Mustern: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Gesamtmenge des Abhängigkeits-/Versionsspeichers: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Gesamtmenge an Slack: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Gesamtmenge an Speicher: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Paketdatei %s ist nicht synchronisiert."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Keine Pakete gefunden"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "Sie müssen mindestens ein Suchmuster angeben"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Paket %s kann nicht gefunden werden"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Paketdateien:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Cache ist nicht synchron, Querverweisen einer Paketdatei nicht möglich"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Mit Pinning verwaltete Pakete:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(nicht gefunden)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Installiert: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(keine)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Paket-Pinning: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Versionstabelle:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -237,33 +238,33 @@ msgstr ""
 "Weitere Informationen finden Sie in den Handbuchseiten von apt-cache(8)\n"
 "und apt.conf(5).\n"
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 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:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "»%s« konnte nicht in »%s« eingebunden werden"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 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."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Argumente nicht paarweise"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -292,12 +293,12 @@ msgstr ""
 "  -c=?  Diese Konfigurationsdatei lesen\n"
 "  -o=?  Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s ist kein gültiges DEB-Paket."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -321,41 +322,41 @@ msgstr ""
 "  -c=?  Diese Konfigurationsdatei lesen\n"
 "  -o=?  Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Schreiben nach %s nicht möglich"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 "Debconf-Version konnte nicht ermittelt werden. Ist debconf installiert?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Paketerweiterungsliste ist zu lang"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Fehler beim Verarbeiten von Verzeichnis %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Quellerweiterungsliste ist zu lang"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Fehler beim Schreiben der Kopfzeilen in die Inhaltsdatei"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Fehler beim Verarbeiten der Inhalte %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -442,26 +443,26 @@ msgstr ""
 "  -c=?         diese Konfigurationsdatei lesen\n"
 "  -o=?         eine beliebige Konfigurationsoption setzen"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Keine Auswahl traf zu"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "Datenbank wurde beschädigt, Datei umbenannt in %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "Datenbank ist veraltet; es wird versucht, %s zu erneuern"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -470,111 +471,111 @@ msgstr ""
 "einer älteren apt-Version gemacht haben, entfernen Sie bitte die Datenbank "
 "und erstellen Sie sie neu."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Datenbankdatei %s kann nicht geöffnet werden: %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Ausführen von »stat« auf %s fehlgeschlagen"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Archiv hat keinen Steuerungsdatensatz"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Unmöglich, einen Cursor zu bekommen"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Verzeichnis %s kann nicht gelesen werden\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Ausführen von »stat« auf %s nicht möglich\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "F: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "F: Fehler gehören zu Datei "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "%s konnte nicht aufgelöst werden"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Durchlaufen des Verzeichnisbaums fehlgeschlagen"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Öffnen von %s fehlgeschlagen"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "readlink von %s fehlgeschlagen"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Entfernen (unlink) von %s fehlgeschlagen"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink-Limit von %sB erreicht.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Archiv hatte kein Feld »package«"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s hat keinen Eintrag in der Override-Liste.\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s-Betreuer ist %s und nicht %s.\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s hat keinen Eintrag in der Source-Override-Liste.\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s hat keinen Eintrag in der Binary-Override-Liste.\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Speicheranforderung fehlgeschlagen"
 
@@ -584,18 +585,18 @@ msgid "Unable to open %s"
 msgstr "%s konnte nicht geöffnet werden"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Missgestaltetes Override %s Zeile %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Missgestaltetes Override %s Zeile %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Missgestaltetes Override %s Zeile %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -603,65 +604,52 @@ msgstr "Missgestaltetes Override %s Zeile %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "Override-Datei %s konnte nicht gelesen werden"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Unbekannter Komprimierungsalgorithmus »%s«"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Komprimierte Ausgabe %s benötigt einen Komprimierungssatz"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
 "Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "FILE* konnte nicht erzeugt werden"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Fork fehlgeschlagen"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Komprimierungs-Kindprozess"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Interner Fehler, %s konnte nicht erzeugt werden"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr ""
-"Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Fehler beim Ausführen von Komprimierer "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "Dekomprimierer"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "E/A zu Kindprozess/Datei fehlgeschlagen"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Problem beim Entfernen (unlink) von %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "%s konnte nicht in %s umbenannt werden"
@@ -670,76 +658,80 @@ msgstr "%s konnte nicht in %s umbenannt werden"
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "aber %s ist installiert"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "aber %s soll installiert werden"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "ist aber nicht installierbar"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "ist aber ein virtuelles Paket"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "ist aber nicht installiert"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "soll aber nicht installiert werden"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " oder"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Die folgenden NEUEN Pakete werden installiert:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Die folgenden Pakete werden ENTFERNT:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Die folgenden Pakete sind zurückgehalten worden:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 "Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (wegen %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -747,59 +739,59 @@ msgstr ""
 "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n"
 "Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu aktualisiert, %lu neu installiert, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu erneut installiert, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu durch eine ältere Version ersetzt, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu nicht vollständig installiert oder entfernt.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Hinweis: »%s« wird für Task »%s« gewählt.\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Hinweis: »%s« wird für regulären Ausdruck »%s« gewählt.\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Paket %s ist ein virtuelles Paket, das bereitgestellt wird von:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Installiert]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr " [Nicht der Installationskandidat]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Sie sollten eines explizit zum Installieren auswählen."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -810,132 +802,132 @@ msgstr ""
 "referenziert. Das kann heißen, dass das Paket fehlt, dass es abgelöst\n"
 "wurde oder nur aus einer anderen Quelle verfügbar ist.\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Doch die folgenden Pakete ersetzen es:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Paket »%s« hat keinen Installationskandidaten"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "Virtuelle Pakete wie »%s« können nicht entfernt werden\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Hinweis: »%s« wird an Stelle von »%s« gewählt\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "%s wird übersprungen; es ist schon installiert und ein Upgrade ist nicht "
 "angefordert.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "%s wird übersprungen; es ist nicht installiert und lediglich Upgrades sind "
 "angefordert.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "Erneute Installation von %s ist nicht möglich,\n"
 "es kann nicht heruntergeladen werden.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ist schon die neueste Version.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s wurde als manuell installiert festgelegt.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Version »%s« (%s) für »%s« gewählt\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Version »%s« (%s) für »%s« gewählt\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt.\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Abhängigkeiten werden korrigiert..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " fehlgeschlagen."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Abhängigkeiten konnten nicht korrigiert werden"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Fertig"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Unerfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Authentifizierungswarnung überstimmt.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Diese Pakete ohne Überprüfung installieren [j/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Einige Pakete konnten nicht authentifiziert werden"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Interner Fehler, Anordnung beendete nicht"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Wie merkwürdig ... die Größen haben nicht übereingestimmt; schreiben Sie "
@@ -943,52 +935,52 @@ 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Es müssen noch %sB von %sB an Archiven 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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Es müssen %sB an Archiven 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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n"
 
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Freier Platz in %s konnte nicht bestimmt werden"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Sie haben nicht genug Platz in %s."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "»Nur triviale« angegeben, aber dies ist keine triviale Operation."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Ja, tue was ich sage!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -999,28 +991,28 @@ msgstr ""
 "Zum Fortfahren geben Sie bitte »%s« ein.\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Abbruch."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Möchten Sie fortfahren [J/n]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Fehlschlag beim Holen von %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Einige Dateien konnten nicht heruntergeladen werden"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1028,19 +1020,19 @@ msgstr ""
 "Einige Archive konnten nicht heruntergeladen werden; vielleicht »apt-get "
 "update« ausführen oder mit »--fix-missing« probieren?"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing und Wechselmedien werden derzeit nicht unterstützt"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Fehlende Pakete konnten nicht korrigiert werden."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Installation abgebrochen."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1054,36 +1046,36 @@ msgstr[1] ""
 "Die folgenden Pakete verschwanden von Ihrem System, da alle\n"
 "Dateien von anderen Paketen überschrieben wurden:"
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Hinweis: Dies wird automatisch und absichtlich von dpkg durchgeführt."
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Nicht verfügbare Veröffentlichung »%s« von Paket »%s« wird ignoriert"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Als Quellpaket wird »%s« statt »%s« gewählt\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Nicht verfügbare Version »%s« von Paket »%s« wird ignoriert"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Der Befehl »update« akzeptiert keine Argumente"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Es soll nichts gelöscht werden, AutoRemover kann nicht gestartet werden"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1102,16 +1094,16 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Interner Fehler, AutoRemover hat etwas beschädigt"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1124,7 +1116,7 @@ msgstr[1] ""
 "Die folgenden Pakete wurden automatisch installiert und werden nicht mehr "
 "benötigt:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1134,19 +1126,19 @@ msgstr[0] ""
 msgstr[1] ""
 "%lu Pakete wurden automatisch installiert und werden nicht mehr benötigt.\n"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Verwenden Sie »apt-get autoremove«, um sie zu entfernen."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Interner Fehler, AllUpgrade hat etwas beschädigt"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1154,7 +1146,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:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1166,75 +1158,75 @@ msgstr ""
 "Unstable-Distribution verwenden, dass einige erforderliche Pakete noch\n"
 "nicht erstellt wurden oder Incoming noch nicht verlassen haben."
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Beschädigte Pakete"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Vorgeschlagene Pakete:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Empfohlene Pakete:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Paket %s konnte nicht gefunden werden"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s wurde als automatisch installiert festgelegt.\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Paketaktualisierung (Upgrade) wird berechnet... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Fertig"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Interner Fehler, der Problemlöser hat etwas beschädigt"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden."
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 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:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Quellpaket für %s kann nicht gefunden werden"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1244,7 +1236,7 @@ msgstr ""
 "auf:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1256,88 +1248,88 @@ msgstr ""
 "um die neuesten (möglicherweise noch unveröffentlichten) Aktualisierungen\n"
 "für das Paket abzurufen.\n"
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, 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:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Quelle %s wird heruntergeladen.\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Einige Archive konnten nicht heruntergeladen werden."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Entpackbefehl »%s« fehlgeschlagen.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, 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:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Kindprozess fehlgeschlagen"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 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:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, 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:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s hat keine Bauabhängigkeiten.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1346,7 +1338,7 @@ msgstr ""
 "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht "
 "gefunden werden kann."
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1355,14 +1347,14 @@ msgstr ""
 "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht "
 "gefunden werden kann."
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1371,7 +1363,7 @@ msgstr ""
 "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da keine verfügbare "
 "Version des Pakets %s die Versionsanforderungen erfüllen kann."
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1380,30 +1372,30 @@ msgstr ""
 "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht "
 "gefunden werden kann."
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, 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:2996
+#: cmdline/apt-get.cc:3031
 #, 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:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Verbindung mit %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Unterstützte Module:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1496,7 +1488,7 @@ msgstr ""
 "bezüglich weitergehender Informationen und Optionen.\n"
 "                                    Dieses APT hat Super-Kuh-Kräfte.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1509,33 +1501,33 @@ msgstr ""
 "         sind, verlassen Sie sich also bezüglich des reellen aktuellen\n"
 "         Status der Sperre nicht darauf!"
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "OK   "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Hole:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ign "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Fehl "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Es wurden %sB in %s geholt (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Wird verarbeitet]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1546,46 +1538,62 @@ msgstr ""
 " »%s«\n"
 "in Laufwerk »%s« ein und drücken Sie die Eingabetaste (Enter).\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "ist aber nicht installiert"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s wurde als manuell installiert festgelegt.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s wurde als automatisch installiert festgelegt.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s ist schon die neueste Version.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s ist schon die neueste Version.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s wurde als manuell installiert festgelegt.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Öffnen von %s fehlgeschlagen"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1607,11 +1615,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Unbekannter Paketeintrag!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1674,197 +1682,199 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Verfügbare Informationen werden zusammengeführt"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Pipes (Weiterleitungen) konnten nicht erzeugt werden"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "gzip konnte nicht ausgeführt werden"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Beschädigtes Archiv"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv beschädigt"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Unbekannter Tar-Kopfzeilen-Typ %u, Bestandteil %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Ungültige Archiv-Signatur"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Fehler beim Lesen der Archivdatei-Kopfzeilen"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "Ungültige Archivbestandteil-Kopfzeile %s"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Ungültige Archivdatei-Kopfzeilen"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Archiv ist zu kurz"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Archiv-Kopfzeilen konnten nicht gelesen werden"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "»DropNode« auf noch verknüpften Knoten aufgerufen"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Hash-Element konnte nicht gefunden werden!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Umleitung konnte nicht reserviert werden"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Interner Fehler in »AddDiversion«"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Es wird versucht, eine Umleitung zu überschreiben: %s -> %s und %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Doppelte Hinzufügung der Umleitung %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Doppelte Konfigurationsdatei %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Datei %s konnte nicht geschrieben werden"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Datei %s konnte nicht geschlossen werden"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Der Pfad %s ist zu lang"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s mehr als einmal entpackt"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Das Verzeichnis %s ist umgeleitet"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Der Umleitungspfad ist zu lang"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "Knoten konnte nicht in seinem Hash gefunden werden"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Der Pfad ist zu lang"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Pakettreffer ohne Version für %s wird überschrieben"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, 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"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s kann nicht gelesen werden"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "»stat« konnte nicht auf %s ausgeführt werden"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "%s konnte nicht entfernt werden"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "%s konnte nicht erzeugt werden"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "»stat« konnte nicht auf %sinfo ausgeführt werden"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "Die »info«- und »temp«-Verzeichnisse müssen in demselben Dateisystem liegen"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Paketlisten werden gelesen"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Wechsel in das Administrationsverzeichnis %sinfo fehlgeschlagen"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Interner Fehler beim Holen eines Paketnamens"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Paketauflistung wird gelesen"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1875,115 +1885,116 @@ msgstr ""
 "nicht wiederherstellen können, dann leeren Sie sie und installieren Sie "
 "sofort dieselbe Version des Paketes erneut!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Fehler beim Lesen der Listendatei %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Interner Fehler beim Holen eines Knotens"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Fehler beim Öffnen der Umleitungsdatei %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "Die Umleitungsdatei ist beschädigt"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Ungültige Zeile in der Umleitungsdatei: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Interner Fehler beim Hinzufügen einer Umleitung"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "Der Paketzwischenspeicher muss zuerst initialisiert werden"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Es konnte keine »Package:«-Kopfzeile gefunden werden, Offset %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Fehlerhafter »ConfFile«-Abschnitt in der Statusdatei, Offset %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Fehler beim Verarbeiten der MD5-Summe. Offset %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Dies ist kein gültiges DEB-Archiv, da es »%s« nicht enthält"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 "Dies ist kein gültiges DEB-Archiv, da es weder »%s«, »%s« noch »%s« enthält"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Wechsel nach %s nicht möglich"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Interner Fehler, Bestandteil %s konnte nicht gefunden werden"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Es konnte keine gültige »control«-Datei gefunden werden"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Auswerten der »control«-Datei nicht möglich"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Pipe (Weiterleitung) für %s konnte nicht geöffnet werden"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Lesefehler von Prozess %s"
 
 # looks like someone hardcoded English grammar
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "»stat« konnte nicht ausgeführt werden"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Änderungszeitpunkt kann nicht gesetzt werden"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "CD-ROM-Datenbank %s kann nicht gelesen werden"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1991,58 +2002,58 @@ msgstr ""
 "Bitte verwenden Sie apt-cdrom, um APT diese CD-ROM bekannt zu machen. apt-"
 "get update kann nicht dazu verwendet werden, neue CD-ROMs hinzuzufügen"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "Falsche CD-ROM"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 "Einbindung von CD-ROM in %s kann nicht gelöst werden, möglicherweise wird "
 "sie noch verwendet."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Medium nicht gefunden."
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Datei nicht gefunden"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Ungültige URI, lokale URIs dürfen nicht mit // beginnen"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Anmeldung läuft"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Name des Kommunikationspartners kann nicht bestimmt werden"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Lokaler Name kann nicht bestimmt werden"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Verbindung durch Server abgelehnt; Server meldet: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Befehl USER fehlgeschlagen, Server meldet: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Befehl PASS fehlgeschlagen, Server meldet: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2050,204 +2061,204 @@ msgstr ""
 "Es war ein Proxy-Server angegeben, aber kein Login-Skript, Acquire::ftp::"
 "ProxyLogin ist leer."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Befehl »%s« des Login-Skriptes fehlgeschlagen, Server meldet: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Befehl TYPE fehlgeschlagen: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Zeitüberschreitung der Verbindung"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Verbindung durch Server geschlossen"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Lesefehler"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Durch eine Antwort wurde der Puffer zum Überlaufen gebracht."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Protokoll beschädigt"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Schreibfehler"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Socket konnte nicht erzeugt werden"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "Daten-Socket konnte wegen Zeitüberschreitung nicht verbunden werden"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Passiver Socket konnte nicht verbunden werden."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 "Von der Funktion getaddrinfo wurde kein auf Verbindungen wartender Socket "
 "gefunden"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Verbindung des Sockets nicht möglich"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Warten auf Verbindungen auf dem Socket nicht möglich"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Name des Sockets konnte nicht bestimmt werden"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "PORT-Befehl konnte nicht gesendet werden"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Unbekannte Adressfamilie %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Befehl EPRT fehlgeschlagen: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Zeitüberschreitung bei Datenverbindungsaufbau"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Verbindung konnte nicht angenommen werden"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Problem bei Bestimmung des Hashwertes einer Datei"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Datei konnte nicht heruntergeladen werden; Server meldet: »%s«"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Zeitüberschreitung bei Datenverbindung"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Datenübertragung fehlgeschlagen; Server meldet: »%s«"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Abfrage"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Aufruf nicht möglich: "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Verbindung mit %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Verbindung mit %s:%s kann nicht aufgebaut werden (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Verbindung mit %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "»%s« konnte nicht aufgelöst werden"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Temporärer Fehlschlag beim Auflösen von »%s«"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, 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:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Verbindung mit %s:%s nicht möglich:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Mindestens eine ungültige Signatur wurde entdeckt."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Unbekannter Fehler beim Ausführen von gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Die folgenden Signaturen waren ungültig:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2256,110 +2267,115 @@ msgstr ""
 "öffentlicher\n"
 "Schlüssel nicht verfügbar ist:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Warten auf Kopfzeilen"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Einzelne Kopfzeile aus %u Zeichen erhalten"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Ungültige Kopfzeile"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Vom HTTP-Server wurde eine ungültige Antwort-Kopfzeile gesandt"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 "Vom HTTP-Server wurde eine ungültige »Content-Length«-Kopfzeile gesandt"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Vom HTTP-Server wurde eine ungültige »Content-Range«-Kopfzeile gesandt"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr ""
 "Teilweise Dateiübertragung wird vom HTTP-Server nur fehlerhaft unterstützt."
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Unbekanntes Datumsformat"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Auswahl fehlgeschlagen"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Zeitüberschreitung bei Verbindung"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Fehler beim Schreiben der Ausgabedatei"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Fehler beim Schreiben in Datei"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Fehler beim Schreiben der Datei"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 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:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Fehler beim Lesen vom Server"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Datei konnte nicht eingekürzt werden"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Fehlerhafte Kopfzeilendaten"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Eine leere Datei kann nicht mit mmap abgebildet werden"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Datei-Deskriptor %i konnte nicht dupliziert werden"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "mmap mit %lu Byte Größe konnte nicht erzeugt werden"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "mmap konnte nicht geschlossen werden"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "mmap konnte nicht synchronisiert werden"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "mmap mit %lu Byte Größe konnte nicht erzeugt werden"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Datei konnte nicht eingekürzt werden"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2368,7 +2384,7 @@ msgstr ""
 "Nicht genügend Platz für »Dynamic MMap«. Bitte erhöhen Sie den Wert von APT::"
 "Cache-Limit. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2377,7 +2393,7 @@ msgstr ""
 "Unmöglich, die Größe der MMap zu erhöhen, da das Limit von %lu Byte bereits "
 "erreicht ist."
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2408,95 +2424,95 @@ msgstr "%li min %li s"
 msgid "%lis"
 msgstr "%li s"
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Auswahl %s nicht gefunden"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Nicht erkannte Typabkürzung: »%c«"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Konfigurationsdatei %s wird geöffnet"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaxfehler %s:%u: Block beginnt ohne Namen."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntaxfehler %s:%u: Missgestaltete Markierung"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntaxfehler %s:%u: Zusätzlicher Unsinn nach Wert"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Syntaxfehler %s:%u: Direktiven können nur auf oberster Ebene benutzt werden"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntaxfehler %s:%u: Zu viele verschachtelte Einbindungen (includes)"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntaxfehler %s:%u: Eingefügt von hier"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive »%s«"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Syntaxfehler %s:%u: Löschdirektiven benötigen einen Optionsbaum als Argument"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntaxfehler %s:%u: Zusätzlicher Unsinn am Dateiende"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Fehler!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Fertig"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Kommandozeilenoption »%c« [aus %s] ist nicht bekannt."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Kommandozeilenoption %s konnte nicht ausgewertet werden"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Kommandozeilenoption %s ist nicht Bool'sch"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Option %s erfordert ein Argument."
@@ -2506,341 +2522,355 @@ msgstr "Option %s erfordert ein Argument."
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Option %s: Konfigurationswertspezifikation benötigt ein »=<Wert>«."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Option %s erfordert ein Ganzzahl-Argument, nicht »%s«"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Option »%s« ist zu lang"
 
 # Check for boolean; -1 is unspecified, 0 is yes 1 is no
-#: 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 "Der Sinn von »%s« ist nicht klar, versuchen Sie »true« oder »false«."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Ungültige Operation %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "»stat« konnte nicht auf den Einbindungspunkt %s ausgeführt werden"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Es konnte nicht nach %s gewechselt werden"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "»stat« konnte nicht auf die CD-ROM ausgeführt werden"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Sperrdatei %s konnte nicht geöffnet werden"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Konnte Sperre %s nicht bekommen"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Unterprozess %s hat einen Speicherzugriffsfehler empfangen."
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Unterprozess %s hat das Signal %u empfangen."
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Unterprozess %s hat Fehlercode zurückgegeben (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Unterprozess %s unerwartet beendet"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Datei %s konnte nicht geöffnet werden"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Datei-Deskriptor %d konnte nicht geöffnet werden"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr ""
+"Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Fehler beim Ausführen von Komprimierer "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "Lesevorgang: es verbleiben noch %lu zu lesen, jedoch nichts mehr übrig"
 
-#: apt-pkg/contrib/fileutl.cc:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr ""
 "Schreibvorgang: es verbleiben noch %lu zu schreiben, jedoch Schreiben nicht "
 "möglich"
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problem beim Schließen der gzip-Datei %s"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem beim Schließen der Datei %s"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem beim Umbenennen der Datei %s nach %s"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem beim Entfernen (unlink) der Datei %s"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Problem beim Synchronisieren der Datei"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Leerer Paketzwischenspeicher"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Die Paketzwischenspeicher-Datei ist beschädigt"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr ""
 "Die Paketzwischenspeicher-Datei liegt in einer inkompatiblen Version vor"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Die Paketzwischenspeicher-Datei ist beschädigt"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Das Versionssystem »%s« wird durch dieses APT nicht unterstützt"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "Der Paketzwischenspeicher wurde für eine andere Architektur aufgebaut"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Hängt ab von"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Hängt ab von (vorher)"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Schlägt vor"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Empfiehlt"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Kollidiert mit"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Ersetzt"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Löst ab"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Beschädigt"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "Wertet auf"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "wichtig"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "erforderlich"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "optional"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Abhängigkeitsbaum wird aufgebaut"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Mögliche Versionen"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Abhängigkeitsgenerierung"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Statusinformationen werden eingelesen"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "StateFile %s konnte nicht geöffnet werden"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Temporäres StateFile %s konnte nicht geschrieben werden"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] nicht auswertbar)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] zu kurz)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] ist keine Zuweisung)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] hat keinen Schlüssel)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 "Missgestaltete Zeile %lu in Quellliste %s ([%s] Schlüssel %s hat keinen Wert)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "%s wird geöffnet"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Zeile %u in Quellliste %s zu lang."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2849,7 +2879,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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Datei »%s« konnte nicht geöffnet werden"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2861,22 +2896,12 @@ msgstr ""
 "ist oft schlimm, aber wenn Sie es wirklich tun wollen, aktivieren Sie bitte "
 "die Option APT::Force-LoopBreak."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"»%s« (bereits entpackt) konnte nicht unmittelbar konfiguriert werden. Lesen "
-"Sie »man 5 apt.conf« unter APT::Immediate-Configure bezüglich weiterer "
-"Details."
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Indexdateityp »%s« wird nicht unterstützt"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2884,7 +2909,7 @@ msgstr ""
 "Das Paket %s muss neu installiert werden, es kann jedoch kein Archiv dafür "
 "gefunden werden."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2892,13 +2917,13 @@ msgstr ""
 "Fehler: Unterbrechungen durch pkgProblemResolver::Resolve hervorgerufen; "
 "dies könnte durch zurückgehaltene Pakete verursacht worden sein."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 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:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2907,248 +2932,210 @@ msgstr ""
 "Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden "
 "ignoriert oder alte an ihrer Stelle benutzt."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Listenverzeichnis %spartial fehlt."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Archivverzeichnis %spartial fehlt."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "Das Verzeichnis %s kann nicht gesperrt werden"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Holen der Datei %li von %li (noch %s)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Holen der Datei %li von %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Der Treiber für Methode %s konnte nicht gefunden werden."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Methode %s ist nicht korrekt gestartet"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: 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:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Bestimmung eines passenden Paketierungssystemtyps nicht möglich"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "»stat« kann nicht auf %s ausgeführt werden."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 "Sie müssen einige »source«-URIs für Quellpakete in die sources.list-Datei "
 "eintragen"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Die Paketliste oder die Statusdatei konnte nicht eingelesen oder geöffnet "
 "werden."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Die Liste der Quellen konnte nicht gelesen werden."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "Ungültiger Eintrag in Einstellungsdatei %s, keine »Package«-Kopfzeile(n)"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Pinning-Typ %s kann nicht interpretiert werden"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Keine Priorität (oder Null) für Pin angegeben"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Zwischenspeicher hat ein inkompatibles Versionssystem"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Fehler aufgetreten beim Verarbeiten von %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Fehler aufgetreten beim Verarbeiten von %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Fehler aufgetreten beim Verarbeiten von %s (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Fehler aufgetreten beim Verarbeiten von %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Fehler aufgetreten beim Verarbeiten von %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Fehler aufgetreten beim Verarbeiten von %s (NewVersion%d)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Fehler aufgetreten beim Verarbeiten von %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Fehler aufgetreten beim Verarbeiten von %s (NewFileDesc2)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Fehler aufgetreten beim Verarbeiten von %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Na so was, Sie haben die Anzahl an Paketen überschritten, mit denen diese "
 "APT-Version umgehen kann."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Na so was, Sie haben die Anzahl an Versionen überschritten, mit denen diese "
 "APT-Version umgehen kann."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Na so was, Sie haben die Anzahl an Beschreibungen überschritten, mit denen "
 "diese APT-Version umgehen kann."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Na so was, Sie haben die Anzahl an Abhängigkeiten überschritten, mit denen "
 "diese APT-Version umgehen kann."
 
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Fehler aufgetreten beim Verarbeiten von %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Fehler aufgetreten beim Verarbeiten von %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "»stat« konnte nicht auf die Liste %s der Quellpakete ausgeführt werden"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "E/A-Fehler beim Speichern des Quell-Caches"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "MD5-Summe stimmt nicht überein"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Hash-Summe stimmt nicht überein"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Release-Datei %s kann nicht verarbeitet werden"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1450
 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:1488
 #, 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:1510
 #, 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:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3159,12 +3146,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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-Fehler: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3173,7 +3160,7 @@ 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 (aufgrund fehlender Architektur)"
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3182,48 +3169,48 @@ 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:1753
+#: apt-pkg/acquire-item.cc:1768
 #, 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:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Größe stimmt nicht überein"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Release-Datei %s kann nicht verarbeitet werden"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Keine Bereiche (Sections) in Release-Datei %s"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Kein Hash-Eintrag in Release-Datei %s"
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, 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:125
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ungültiger »Date«-Eintrag in Release-Datei %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Herstellerblock %s enthält keinen Fingerabdruck"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3232,41 +3219,41 @@ msgstr ""
 "Verwendeter CD-ROM-Einbindungspunkt: %s\n"
 "CD-ROM wird eingebunden\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Identifizieren ... "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Gespeicherte Kennzeichnung: %s\n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "Einbindung der CD-ROM wird gelöst ...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Verwendeter CD-ROM-Einbindungspunkt: %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Lösen der CD-ROM-Einbindung\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Warten auf Medium ...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "CD-ROM wird eingebunden ...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Durchsuchen des Mediums nach Index-Dateien ...\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3275,7 +3262,7 @@ msgstr ""
 "%zu Paketindizes, %zu Quellindizes, %zu Übersetzungsindizes und %zu "
 "Signaturen gefunden\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3283,16 +3270,16 @@ msgstr ""
 "Es konnten keine Paketdateien gefunden werden; möglicherweise ist dies keine "
 "Debian-Disk oder eine für die falsche Architektur?"
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Kennzeichnung »%s« gefunden\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Dies ist kein gültiger Name, versuchen Sie es erneut.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3301,94 +3288,94 @@ msgstr ""
 "Dieses Medium heißt: \n"
 "»%s«\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Kopieren der Paketlisten ..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Schreiben der neuen Quellliste\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "Quelllisteneinträge für dieses Medium sind:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Es wurden %i Datensätze geschrieben.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, 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:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Es wurden %i Datensätze mit %i fehlenden und %i nicht passenden Dateien "
 "geschrieben.\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Nicht vorhandene Datei %s wird übersprungen"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Authentifizierungs-Datensatz konnte nicht gefunden werden für: %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash-Summe stimmt nicht überein für: %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "Kein Schlüsselring in %s installiert."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Veröffentlichung »%s« für »%s« konnte nicht gefunden werden"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Version »%s« für »%s« konnte nicht gefunden werden"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Task »%s« konnte nicht gefunden werden"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Es können keine Versionen von Paket »%s« ausgewählt werden, da es rein "
 "virtuell ist"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3397,130 +3384,154 @@ msgstr ""
 "Es kann weder eine installierte Version noch ein Installationskandidat von "
 "Paket »%s« ausgewählt werden, da beide nicht existieren"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Die neueste Version von Paket »%s« kann nicht ausgewählt werden, da es rein "
 "virtuell ist"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Es kann kein Installationskandidat von Paket »%s« ausgewählt werden, da kein "
 "solcher existiert"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Die installierte Version von Paket »%s« kann nicht ausgewählt werden, da es "
 "nicht installiert ist"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "%s wird installiert"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "%s wird konfiguriert"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "%s wird entfernt"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s wird vollständig entfernt"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Verschwinden von %s festgestellt"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Verzeichnis »%s« fehlt"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Datei »%s« konnte nicht geöffnet werden"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "%s wird vorbereitet"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s wird entpackt"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Konfiguration von %s wird vorbereitet"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "%s installiert"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Entfernen von %s wird vorbereitet"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "%s entfernt"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Vollständiges Entfernen von %s wird vorbereitet"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s vollständig entfernt"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "Ausführen von dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert"
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3528,7 +3539,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:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3536,7 +3547,7 @@ msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
 "wegen voller Festplatte hindeutet"
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3544,14 +3555,14 @@ msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
 "wegen erschöpftem Arbeitsspeicher hindeutet"
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Ein-/"
 "Ausgabe-Fehler von Dpkg hindeutet"
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3560,7 +3571,7 @@ msgstr ""
 "Sperren des Administrationsverzeichnisses (%s) nicht möglich, wird es von "
 "einem anderen Prozess verwendet?"
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
@@ -3568,7 +3579,7 @@ msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3576,30 +3587,30 @@ msgstr ""
 "Der dpkg-Prozess wurde unterbrochen; Sie müssen manuell »%s« ausführen, um "
 "das Problem zu beheben."
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Nicht gesperrt"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "Keine Datei von Spiegelserver »%s« gefunden"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Keine Datei von Spiegelserver »%s« gefunden"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Spiegelserver: %s]"
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3608,7 +3619,7 @@ msgstr ""
 "Patch konnte nicht mit mmap und unter Verwendung von Dateioperationen auf %s "
 "angewendet werden - der Patch scheint beschädigt zu sein."
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3617,10 +3628,73 @@ msgstr ""
 "Patch konnte nicht mit mmap auf %s angewendet werden (es ist jedoch nichts "
 "mmap-spezifisches fehlgeschlagen) - der Patch scheint beschädigt zu sein."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Verbindung vorzeitig beendet"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr ""
+#~ "Hinweis: Dies wird automatisch und absichtlich von dpkg durchgeführt."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Missgestaltetes Override %s Zeile %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Missgestaltetes Override %s Zeile %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Missgestaltetes Override %s Zeile %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "Dekomprimierer"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr ""
+#~ "Lesevorgang: es verbleiben noch %lu zu lesen, jedoch nichts mehr übrig"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr ""
+#~ "Schreibvorgang: es verbleiben noch %lu zu schreiben, jedoch Schreiben "
+#~ "nicht möglich"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "»%s« (bereits entpackt) konnte nicht unmittelbar konfiguriert werden. "
+#~ "Lesen Sie »man 5 apt.conf« unter APT::Immediate-Configure bezüglich "
+#~ "weiterer Details."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Fehler aufgetreten beim Verarbeiten von %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Fehler aufgetreten beim Verarbeiten von %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Fehler aufgetreten beim Verarbeiten von %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Fehler aufgetreten beim Verarbeiten von %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Fehler aufgetreten beim Verarbeiten von %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Fehler aufgetreten beim Verarbeiten von %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Fehler aufgetreten beim Verarbeiten von %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Fehler aufgetreten beim Verarbeiten von %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Fehler aufgetreten beim Verarbeiten von %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Fehler aufgetreten beim Verarbeiten von %s (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Interner Fehler, Bestandteil konnte nicht gefunden werden"
 
diff --git a/po/dz.po b/po/dz.po
index 6b270f6ef..9cb7b35a8 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt_po.pot\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -19,154 +19,155 @@ msgstr ""
 "X-Poedit-Country: Bhutan\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "ཐུམ་སྒྲིལ་ %s ཐོན་རིམ་ %s ལུ་ ཌེཔ་མ་ཚང་ཅིག་འདུག:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "ཐུམ་སྒྲིལ་བསྡོམས་ཀྱི་མིང་ཚུ:"
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 #, fuzzy
 msgid "Total package structures: "
 msgstr "ཐུམ་སྒྲིལ་བསྡོམས་ཀྱི་མིང་ཚུ:"
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "སྤྱིར་བཏང་ཐུམ་སྒྲིལ་ཚུ།"
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་གཙང་མ་ཚུ:"
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་རྐྱང་པ་ཚུ:"
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་སླ་བསྲེ་ཡོད་མི་ཚུ:"
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "བརླག་སྟོར་ཞུགས་པ:"
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "ཁྱད་རྟགས་ཅན་གྱི་ཐོན་རིམ་ཚུ་གི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "ཁྱད་རྟགས་ཅན་གྱི་ཐོན་རིམ་ཚུ་གི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "རྟེན་འབྲེལ་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "ཐེན་རིམ་/ཡིག་སྣོད་ མཐུན་འབྲེལ་གྱི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "ཐེན་རིམ་/ཡིག་སྣོད་ མཐུན་འབྲེལ་གྱི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "ཡོངས་བསྡོམས་ཀྱིས་ས་ཁྲ་བཟོ་བ་ཚུ་བྱིནམ་ཨིན:"
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "སྤུངས་ཡོད་པའི་ཡིག་རྒྱུན་གྱི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "རྟེན་འབྲེལ་ཐོན་རིམ་བར་སྟོང་གྱི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "བར་སྟོང་ལྷུག་ལྷུག་གི་བསྡོམས:"
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "གི་དོན་ལུ་རྩིས་ཐོ་བཏོན་ཡོད་པའི་བར་སྟོང:"
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "ཐུམ་སྒྲིལ་ཡིག་སྣོད་ %sའདི་མཉམ་འབྱུང་གི་ཕྱི་ཁར་ཨིན་པས།"
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "ཐུམ་སྒྲིལ་ཚུ་མ་ཐོབ།"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "ཁྱོད་ཀྱིས་ཏག་ཏག་སྦེ་དཔེ་གཞི་གཅིག་བྱིན་དགོ"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "%sཐུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་ཐོབ།"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "ཐུམ་སྒྲིལ་གྱི་ཡིག་སྣོད:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "འདྲ་མཛོད་འདི་མཉམ་བྱུང་གི་ཕྱི་ཁར་ཨིན་པས་  ཐུམ་སྒྲིལ་ཡིག་སྣོད་ཅིག་ལུ་ ཨེགསི་-རེཕ་འབད་མི་ཚུགས་པས།"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "ཁབ་གཟེར་བཏབ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(མ་ཐོབ།)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "གཞི་བཙུགས་འབད་ཡོདཔ།"
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "མི་ངོ:"
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(ཅི་མེད།)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "ཐུམ་སྒྲིལ་གྱི་ཁབ་གཟེར:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -241,29 +242,29 @@ msgstr ""
 "cache=/tmp\n"
 " ཧེང་བཀལ་བརྡ་དོན་གི་དོན་ལུ་ ཨེ་apt-cache(8)དང་apt.conf(5)ལག་ཐོག་ཤོག་ལེབ་ཚུ་བལྟ།.\n"
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 #, 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:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "ཌིསིཀ་ཅིག་འདྲེན་འཕྲུལ་ནང་བཙུགས་བཞིནམ་ལས་ལོག་ལྡེ་འདི་ཨེབ།"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "ཁྱོད་ཀྱི་ཆ་ཚན་ནང་གི་སི་ཌི་ལྷག་ལུས་ཡོད་མི་གི་དོན་ལུ་འ་ནི་ལས་སྦྱོར་དེ་ཡང་བསྐྱར་འབད།"
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "སྒྲུབས་རྟགས་ཚུ་ཟུང་ནང་མིན་འདུག"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -291,12 +292,12 @@ msgstr ""
 "  -c=? འདི་གིས་འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
 "  -o=? མཐུན་སྒྲིག་གི་རིམ་སྒྲིག་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན་  དཔེར་ན་-o dir::cache=/tmp་བཟུམ།\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s འདི་ནུས་ཅན་གྱི་ ཌི་ཨི་བི་ཅིག་མེན་པས།"
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -320,40 +321,40 @@ msgstr ""
 "  -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་  དཔེར་ན་-o dir::cache=/tmp་"
 "བཟུམ།\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr " %sལུ་འབྲི་མ་ཚུགས།"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "debconf ་་འཐོན་རིམ་འདི་ལེན་མ་ཚུགས། debconf འདི་གཞི་བཙུགས་འབད་ཡི་ག་?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "ཐུམ་སྒྲིལ་རྒྱ་བསྐྱེད་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "འབྱུང་ཁུངས་རྒྱ་བསྐྱེད་ཀྱི་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིང་པས།"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "ནང་དོན་ཡིག་སྣོད་ལུ་མགོ་ཡིག་འཛོལ་བ་འབྲི་ནིའི་མགོ་ཡིག"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "%sའཛོལ་བ་ལས་སྦྱོར་འབད་ནིའི་ནང་དོན།"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -437,26 +438,26 @@ msgstr ""
 "  -c=?  འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷག\n"
 "  -o=?  མཐུན་སྒྲིག་རིམ་སྒྲིག་གི་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབད།"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "སེལ་འཐུ་ཚུ་མཐུན་སྒྲིག་མིན་འདུག"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཐུམ་སྒྲིལ་ཡིག་སྣོད་སྡེ་ཚན་`%s'ནང་བརླག་སྟོར་ཞུགས་ནུག"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "ཌི་བི་ངན་ཅན་བྱུང་ནུག་   %s.རྒསཔ་ལུ་ཡིག་སྣོད་འདི་བསྐྱར་མིང་བཏགས་ཡི།"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "ཌི་བི་འདི་རྙིངམ་ཨིན་པས་  %s་ཡར་བསྐྱེད་འབད་ནིའི་དོན་ལུ་དཔའ་བཅམ་དོ།"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 #, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
@@ -465,111 +466,111 @@ msgstr ""
 "ཌི་བི་རྩ་སྒྲིག་འདི་ ནུས་མེད་ཨིན་པས།  ཁྱོད་ཀྱི་ apt་ གྱི་འཐོན་རིམ་རྙིངམ་ཅིག་ནང་ལས་  ཡར་བསྐྱེད་འབད་ཡོད་"
 "པ་ཅིན་  རྩ་བསྐྲད་གཏང་ཞིནམ་ལས་  གནད་སྡུད་གཞི་རྟེན་འདི་ ལོག་དེ་གསར་བསྐྲུན་འབད། "
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, 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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s་སིཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་དྲན་ཐོ་མིན་འདུག"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "འོད་རྟགས་ལེན་མ་ཚུགས།"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "ཌབ་ལུ:%sསྣོད་ཐོ་འདི་ལྷག་མ་ཚུགས།\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "ཌབ་ལུ་ %s སིཊེཊི་འབད་མ་ཚུགས།\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "ཨི:"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "ཌབ་ལུ:"
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "ཨི:འཛོལ་བ་ཚུ་ཡིག་སྣོད་ལུ་འཇུག་སྤྱོད་འབད།"
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "%s་མོས་མཐུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "རྩ་འབྲེལ་ཕྱིར་བགྲོད་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོདཔ།"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "%s་འབྲེལ་ལམ་མེད་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: 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:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "དྲན་ཚད་སྤྲོད་ནིའི་དོན་ལུ་ རི་ཨེ་ལོཀ་ འཐུས་ཤོར་བྱུང་ཡོད།"
 
@@ -579,18 +580,18 @@ msgid "Unable to open %s"
 msgstr "%s་ཁ་ཕྱེ་མ་ཚུགས།"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -598,63 +599,51 @@ msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག
 msgid "Failed to read the override file %s"
 msgstr "ཟུར་བཞག་ཡིག་སྣོད་%sའདི་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr " མ་ཤེས་ཨེབ་བཙུགས་ཨཱལ་གོ་རི་དམ'%s'"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "ཨེབ་བཙུགས་འབད་ཡོད་པའི་ཨའུཊི་པུཊི་%sལུ་ཨེབ་བཙུགས་ཆ་ཚན་ཅིག་དགོཔ་འདུག"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་ཨའི་པི་སི་རྒྱུད་དུང་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "ཡིག་སྣོད་*་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "ཁ་སྤེལ་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོད།"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "ཆ་ལག་ཨེབ་བཙུགས་འབད།"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "ནང་འཁོད་འཛོལ་བ་ %s་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "ཡན་ལག་ལས་སྦྱོར་ ཨའི་པི་སི་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "ཨེབ་འཕྲུལ་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "ཨེབ་བཤོལ་འཕྲུལ་ཆས།"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་IO/ཡིག་སྣོད་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "ཨེམ་ཌི་༥་གློག་རིག་རྐྱབ་པའི་སྐབས་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "%s་འབྲེལ་འཐུད་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལ།"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
@@ -663,75 +652,79 @@ msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི�
 msgid "Y"
 msgstr "ཝའི།"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr "ཡང་ན།"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s( %s་གིས་སྦེ)"
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -739,60 +732,60 @@ msgstr ""
 "ཉེན་བརྡ:འོག་གི་ཉོ་མཁོ་བའི་ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏང་འོང་།\n"
 "ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།"
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།"
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།"
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "གྱིས་བྱིན་ཏེ་ཡོད་པའི་ཐུམ་སྒྲིལ་%s་འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན།\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 #, fuzzy
 msgid " [Not candidate version]"
 msgstr "མི་ངོ་འཐོན་རིམཚུ།"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "ཁྱོད་ཀྱི་གཞི་བཙུགས་འབད་ནི་ལུ་གཏན་འཁལ་སྦེ་གཅིག་སེལ་འཐུ་འབད་དགོ"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -803,132 +796,132 @@ msgstr ""
 "འདི་གིས་ཐུམ་སྒྲིལ་ཅིག་བརླག་སྟོར་ཞུགས་ཡོདཔ་ཨིནམ་སྟོནམ་ཨིནམ་དང་ ཕན་མེད་སྦེ་གནས་ཡོདཔ་  ཡང་ན་\n"
 "འདི་གཞན་འབྱུང་ཅིག་ནང་ལས་ལས་རྐྱངམ་ཅིག་འཐོབ་ཚུགསཔ་ཨིན་པས།\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "ག་དེ་སྦེ་ཨིན་རུང་འོག་གི་ཐུམ་སྒྲིལ་ཚུ་གིས་ འདི་ཚབ་བཙུགསཔ་ཨིན:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "ཐུམ་སྒྲིལ་%s་ལུ་གཞི་བཙུགས་ཀྱི་མི་ངོ་མིན་འདུག"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "%s་གོམ་འགྱོ་འབད་དོ་  འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་"
 "འབད་བས།\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "%s་གོམ་འགྱོ་འབད་དོ་  འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་"
 "འབད་བས།\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "%s ་ལོག་གཞི་བཙུགས་འབད་ནི་འདི་མི་སྲིད་པ་ཅིག་ཨིན་པས་ འདི་ཕབ་ལེན་འབད་མི་བཏུབ་པས།\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོ།"
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr "འབད་ཚར་ཡི།"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། -f ལག་ལེན་འཐབ་སྟེ་འབད་རྩོལ་བསྐྱེད།"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ཉེན་བརྡ:འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་བདེན་བཤད་འབད་མི་བཏུབ་པས།"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "བདེན་བཤད་ཉེན་བརྡ་འདི་ཟུར་འབད་ཡོད།\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི་ཐུམ་སྒྲིལ་འདི་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་[y/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་བདེན་བཤད་འབད་མ་ཚུགས།"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེདཐོག་ལས་ལག་ལེན་འཐབ་སྟེ་ཡོད།"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "ནང་འཁོད་ཀྱི་འཛོལ་བ་  གཞི་བཙུགས་ཐུམ་སྒྲིལ་ཚུ་ ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་དང་གཅིག་ཁར་བོད་བརྡ་འབད་འདི་"
 "ཡོད!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏང་དགོཔ་འདུག་འདི་འབདགཝ་ད་རྩ་བསྐྲད་གཏང་ནི་འདི་ལྕོགས་མིན་ཐལ་ཏེ་འདུག"
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "ནང་འཁོད་འཛོལ་བ་  གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "ག་ཅི་གི་ཡ་མཚན་ཆེ་མི་ཆེ་  ཚད་འདི་གིས་ email apt@packages.debian.org་ལུ་མཐུན་སྒྲིག་མི་འབད་"
@@ -936,52 +929,52 @@ 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:1142
+#: cmdline/apt-get.cc:1156
 #, 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:1147
+#: cmdline/apt-get.cc:1161
 #, 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:1154
+#: cmdline/apt-get.cc:1168
 #, 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:1159
+#: cmdline/apt-get.cc:1173
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n"
 
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s་ནང་བར་སྟོང་"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s ནང་ཁྱོད་ལུ་བར་སྟོང་དལཝ་ལངམ་སྦེ་མིན་འདུག"
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "གལ་ཆུང་རྐྱངམ་ཅིག་ཁསལ་བཀོད་འབད་ནུག་ འདི་འབདཝ་ད་འ་ནི་འདི་གལ་ཆུང་གི་བཀོལ་སྤྱོད་མེན།"
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "ཨིན་ ང་གིས་སླབ་དོ་བཟུམ་སྦེ་རང་འབད!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -992,28 +985,28 @@ msgstr ""
 "འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་'%s'ཚིག་ཚན་ནང་ལུ་ཡིག་དཔར་རྐྱབས།\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "བར་བཤོལ་འབད།"
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?"
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1021,19 +1014,19 @@ msgstr ""
 "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་མི་ཚུགས་པས་  apt-get་དུས་མཐུན་བཟོ་ནི་གཡོག་བཀོལ་ནི་ཨིན་ན་ཡང་ན་--fix-"
 "missing་དང་གཅིག་ཁར་འབད་རྩོལ་བསྐྱེད་ནི་ཨིན་ན་?"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing་དང་བརྡ་ལམ་བརྗེ་སོར་འབད་ནི་འདི་ད་ལྟོ་ལས་རང་རྒྱབ་སྐྱོར་མི་འབད་བས།"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1043,35 +1036,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1087,16 +1080,16 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1106,7 +1099,7 @@ msgid_plural ""
 msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1114,19 +1107,19 @@ msgid_plural ""
 msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "ནང་འགོད་འཛོལ་བ་  ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1134,7 +1127,7 @@ msgstr ""
 "མ་ཚང་བའི་རྟེན་འབྲེལ་  ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།"
 "(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)"
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1145,80 +1138,80 @@ msgstr ""
 "འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་"
 "འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།"
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "འབད་ཚར་ཡི།"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
 
-#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1226,106 +1219,106 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s་འབྱུང་ཁུངས་ལེན།\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n"
 
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
 
-#: cmdline/apt-get.cc:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ"
 
-#: cmdline/apt-get.cc:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།"
 
-#: cmdline/apt-get.cc:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, 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:2889
+#: cmdline/apt-get.cc:2924
 #, 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:2912
+#: cmdline/apt-get.cc:2947
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་  གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་"
 "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།"
 
-#: cmdline/apt-get.cc:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1334,37 +1327,37 @@ msgstr ""
 "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་"
 "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, 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:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག"
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s)་ལུ་མཐུད་དོ།"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1453,7 +1446,7 @@ msgstr ""
 "ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n"
 "                       འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1461,33 +1454,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "ཨེབ།"
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "ལེན:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "ཨེལ་ཇི་ཨེན:"
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "ཨི་ཨར་ཨར།"
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%s (%sB/s)་ནང་ལུ་%sB་དེ་ལེན་ཡོདཔ་ཨིན།\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [ལཱ་འབད་དོ།]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1498,46 +1491,62 @@ msgstr ""
 " '%s'\n"
 "འདྲེན་འཕྲུལ་'%s'ནང་བཙུགས་བཞིནམ་ལས་ལོག་ལྡེ་འདི་ཨེབ།\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1559,11 +1568,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "མ་ཤེས་པའི་ཐུམ་སྒྲིལ་གི་དྲན་ཐོ།"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1629,196 +1638,198 @@ msgstr ""
 msgid "Merging available information"
 msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "རྒྱུད་དུང་ཚུ་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "ཇི་ཛིཔ་འདི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "ངན་ཅན་གྱི་ཡིག་མཛོད།"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "ཊར་ཅེག་སམ་དེ་འཐུས་ཤོར་བྱུང་ཡོད་  ཡིག་མཛོད་ངན་ཅན་བྱུང་ནུག"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "མ་ཤེས་པའི་ ཊཱར་་མགོ་ཡིག་་དབྱེ་བ་ %u་ འཐུས་མི་ %s།"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "ནུས་མེད་ཡིག་མཛོད་ཀྱི་མིང་རྟགས།"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "ཡིག་མཛོད་འཐུས་མི་མགོ་ཡིག་ལྷག་ནིའི་འཛོལ་བ།"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, fuzzy, c-format
 msgid "Invalid archive member header %s"
 msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "ཡིག་མཛོད་འདི་གནམ་མེད་ས་མེད་ཐུང་ཀུ་འདུག"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "ཡིག་མཛོད་མགོ་ཡིག་ཚུ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "ད་ལྟོ་ཡང་འབྲེལ་ལམ་ཡོད་པའི་མཐུད་མཚམས་གུར་བཀོག་བཞག་མཐུད་མཚམས་དེ་བོད་བརྡ་འབད་འདི་ཡོད།"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "དྲྭ་རྟགས་རྒྱུ་རྫས་འདི་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "ཁ་ཕྱོགས་སྤྲོད་བཞག་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "ཁ་ཕྱོགས་ཁ་སྐོང་རྐྱབ་ནི་ནང་  ནང་འཁོད་ཀྱི་འཛོལ་བ།"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "%s -> %s ་དང་ %s/%s་ཁ་ཕྱོགས་ཅིག་ཚབ་སྲུང་འབད་ནི་ལུ་འབད་རྩོལ་བསྐྱེད་དོ།"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "%s -> %s་ཁ་ཕྱོགས་ཀྱི་ལོག་བལྟབ་ཁ་སྐོང་།"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s/%s་འདི་ངོ་བཤུས་བཟོ།"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "%s་ཡིག་སྣོད་འདི་ཁ་བསྡམས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "%s་འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "སྦུང་ཚན་བཟོ་བཤོལ་%s་གཅིག་ལས་ལྷག་སྟེ་འདུག"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "སྣོད་ཐོ་%s་འདི་ཁ་ཕྱོགས་སྒྱུར་དེ་ཡོད།"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "ཐུམ་སྒྲིལ་འདི་གིས་ག་སྒྱུར་དམིགས་གཏད་%s/%s་ལུ་འབྲི་ནིའི་འབད་རྩོལ་བསྐྱེདཔ་དེ་ཡོད།"
 
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "ཁ་སྒྱུར་འགྲུལ་ལམ་འདི་གནམ་མེད་ས་མེད་རིངམ་ཨིན་པས།"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "སྣོད་ཡིག་%s་འདི་སྣོད་ཡིག་མེན་མི་ཅིག་གིས་ཚབ་བཙུག་དེ་ཡོདཔ་ཨིན།"
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "ཁོང་རའི་དྲྭ་རྟགས། (#)རྡོབ་ནང་ལུ་མཐུད་མཚམས་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་ཅིག་ཨིན་པས།"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "%s་གི་དོན་ལུ་ཚབ་སྲུང་འབད་བའི་ཐུམ་སྒྲིལ་དེ་གིས་འཐོན་རིམ་གཅིག་ད་ཡང་མཐུན་སྒྲིག་མི་འབད་བས།"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "ཐུམ་སྒྲིལ་%s་ནང་ལུ་་ཡིག་སྣོད་%s/%sགིས་གཅིག་ཚབ་སྲུང་འབདཝ་ཨིན།"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས།"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚུགས།"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "%s་རྩ་བསྐྲད་གཏང་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "%s་གསར་བསྐྲུན་འབད་མ་ཚུགས།"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "%sinfo་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "info ་དང་ temp་སྣོད་ཐོ་ཚུ་ཡིག་སྣོད་རིམ་ལུགས་གཅིག་གུར་ལུ་བཞག་དགོཔ་ཨིན།"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "བདག་སྐྱོང་སྣོད་ཐོ་ %sinfo་ལུ་བསྒྱུར་བཅོས་འབད་ནི་ འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "ནང་འཁོད་འཛོལ་བ་གིས་ཐུམ་སྒྲིལ་མིང་ཅིག་ལེན་དོ།"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "ཡིག་ཐོ་བཀོད་འབད་མི་ཚུ་ལྷག་དོ།"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1828,113 +1839,114 @@ msgstr ""
 "'%sinfo/%s'ཡིག་སྣོད་ཐོག་ཡིག་ཁ་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད། ཁྱོད་ཀྱི་ཡིག་སྣོད་འདི་སོར་ཆུད་འབད་མ་ཚུགས་པ་"
 "ཅིན་ འདི་སྟོངམ་བཟོ་བཞིནམ་ལས་ དེ་འཕྲལ་ལས་རང་ཐུམ་སྒྲིལ་གི་འཐོན་རིམ་གཅིགཔ་འདི་རང་ལོང་གཞི་བཙུགས་འབད།"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "%sinfo/%s་ཡིག་སྣོད་ཐོ་བཀོད་འདི་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "ནང་འཁོད་འཛོལ་བ་གིས་མཐུད་མཚམས་ལེན་དོ།"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "ཁ་ཕྱོགས་ཡིག་སྣོད་%sdiversionsཚུ་ཁ་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 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
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "ནང་འཁོད་འཛོལ་ ཁ་ཕྱོགས་ཅིག་ཁ་སྐོང་རྐྱབ་དོ།"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "པི་ཀེ་ཇི་ འདྲ་མཛོད་དེ་ དང་པ་རང་འགོ་བྱེད་འབད་དགོ"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "ཐུམ་སྒྲིལ་ཅིག་འཚོལ་་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན:མགོ་ཡིག་ པར་ལེན%lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "གནད་ཚད་ཡིག་སྣོད་དབྱེ་ཚན་ནང་ལུ་ རིམ་སྒྲིག་ཡིག་སྣོད་བྱང་ཉེས། པར་ལེན་ %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "ཨེམ་ཌི་༥་ འཛོལ་བ་མིང་དཔྱད་འབད་དོ། པར་ལེན་ %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "འ་ནི་འདི་ ཌི་ཨི་བི་ཡིག་མཛོད་ནུས་ཅན་ཅིག་མེན་པས་  '%s'འཐུས་མི་བརླག་སྟོར་ཞུགས་དོ།"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 apt-inst/deb/debfile.cc:55
 #, fuzzy, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 msgstr "འ་ནི་འདི་ཌི་ཨི་བི་ཡིག་མཛོད་ནུས་ཅན་ཅིག་མེན་པས་  འདི་ལུ་'%s'ཡང་ན་'%s'འཐུས་མི་མིན་འདུག"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚུགས།"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "ནང་འཁོད་འཛོལ་བ་གིས་འཐུས་མི་%sའདི་ག་ཡོད་འཚོལ་མ་འཐོབ།"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "ནུས་ཅན་ཡོད་པའི་ཚད་འཛིན་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "མིང་དཔྱད་འབད་མ་བཏུབ་པའི་ཚད་འཛིན་ཡིག་སྣོད།"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "%s་ལས་སྦྱོར་ནང་ལས་འཛོལ་བ་ཚུ་ལྷག"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "སི་ཌི་རོམ་གནད་སྡུད་གཞི་རྟེན་%s་འདི་ལྷག་མ་ཚུགས།"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1942,57 +1954,57 @@ msgstr ""
 "འ་ནི་སི་ཌི་-རོམ་འདི་ཨེ་པི་ཊི་་གིས་ ངོས་འཛིན་འབད་ཚུགསཔ་སྦེ་བཟོ་ནིའི་་དོན་ལུ་ ཨེ་པི་ཊི་-སི་ཌི་རོམ་ལག་ལེན་"
 "འཐབ་གནང། apt-get་དུས་མཐུན་བཟོ་ནི་དེ་ སི་ཌི་-རོམས་གསརཔ་ཁ་སྐོང་རྐྱབ་ནི་ལུ་ལག་ལེན་འཐབ་མི་བཏུབ།"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "སི་དི་-རོམ་ཕྱི་འགྱུར།"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 "%s་ནང་་སི་ཌི་-རོམ་འདི་བརྩེགས་བཤོལ་འབད་མ་ཚུགས་ འདི་ད་ལྟོ་ཡང་ལག་ལེན་འཐབ་སྟེ་ཡོདཔ་འོང་ནི་མས།"
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "ཌིཀསི་དེ་འཚོལ་མ་ཐོབ།"
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "ཡུ་ཨར་ཨེལ་ ནུས་མེད་  ཉེ་གནས་ ཡུ་ཨར་ཨེལ་ཨེསི་འདི་གིས་//་དང་གཅིག་ཁར་འགོ་བཙུགས་ནི་མི་འོང་།"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "ནང་བསྐྱོད་འབད་དོ།"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "དོ་བཉམ་གི་མིང་འདི་གཏན་འབེབས་བཟོ་མ་ཚུགས།"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "ཉེ་གནས་མིང་འདི་གཏན་འབེེབས་བཟོ་མ་ཚུགས།"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "སར་བར་འདི་གིས་ མཐུད་ལམ་འདི་ངོས་ལེན་འབད་མ་བཏུབ་པར་སླབ་མས: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "ལག་ལེན་པ་འཐུས་ཤོར་བྱུང་ཡོད་  སར་བར་གྱིས་སླབ་མས་: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "རྩི་སྤྲོད་འཐུས་ཤོར་བྱུང་ཡོད་  སར་བར་གྱིས་སླབ་མས་: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2000,323 +2012,328 @@ msgstr ""
 "པོརོ་སི་སར་བར་ཅིག་གསལ་བཀོད་འབད་ཡོད་འདི་འབདཝ་ད་  ནང་བསྐྱོད་ཡིག་ཚུགས་མིན་འདུག་ Acquire::ftp::"
 "ProxyLoginའདི་སྟོངམ་ཨིན་པས།"
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "ནང་བསྐྱོད་ཡིག་ཚུགས་ བརྡ་བཀོད་'%s'་འདི་འཐོས་ཤོར་བྱུང་ཡོད་ སར་བར་གྱིས་སླབ་མས:%s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "ཡིག་དཔར་རྐྱབ་མ་བཏུབ་སར་བར་གྱིས་སླབ་མས། %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "མཐུད་ལམ་ངལ་མཚམས"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "སར་བར་གྱིས་མཐུད་ལམ་འདི་ཁ་བསྡམས་ཏེ་ཡོདཔ་ཨིན།"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "འཛོལ་བ་ལྷབ།"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "ལན་གྱིས་ གནད་ཁོངས་གུར་ལས་ ལུད་སོང་སྟེ་ཡོདཔ་ཨིན།"
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "འཛོལ་བ་འབྲི།"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "སོ་ཀེཊི་ཅིག་གསར་བསྐྲུན་འབད་མ་ཚུགས་པར་ཡོདཔ་ཨིན།"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "གནད་སྡུད་སོ་ཀེཊི་མཐུད་མ་ཚུགས་པར་ཡོདཔ་ཨིན་  མཐུད་ལམ་ངལ་མཚམས།"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "བྱ་ཡུལ་གྱི་སོ་ཀེཊི་མཐུད་མ་ཚུགས།"
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo་འདི་གིས་ཉན་ནིའི་སོ་ཀེཊི་ཅིག་ལེན་མ་ཚུགས།"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "སོ་ཀེཊི་ཅིག་བསྡམས་མ་ཚུགས།"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "སོ་ཀེཊི་གུར་ཉེན་མ་ཚུགས།"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "སོ་ཀེཊི་གི་མིང་འདི་གཏན་འབེབས་བཟོ་མ་ཚུགས།"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "འདྲེན་ལམ་གྱི་བརྡ་བཀོད་འདི་བཏང་མ་ཚུགས།"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "མ་ཤེས་པའི་ཁ་བྱང་གི་རིགས་ཚན་%u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "ཨི་པི་ཨར་ཊི་ འཐུས་ཤོར་བྱུང་ཡོད་  སར་བར་གིས་སླབ་མས:%s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ནི་ངལ་མཚམས་བྱུང་ནུག"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "ཡིག་སྣོད་ལེན་མ་ཚུགས་ སར་བར་'%s'གིས་སླབ་མས"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "གནད་སྡུད་སོ་ཀེཊི་ངལ་མཚམས།"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "གནད་སྡུད་གནས་སོར་དེ་འཐུས་ཤོར་བྱུང་ཡོད་  སར་བར་'%s'་གིས་སླབ་མས།"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "འདྲི་དཔྱད།"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།"
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "%s (%s)་ལུ་མཐུད་དོ།"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "%s:%s (%s)ལུ་མཐུད་ལམ་དེ་འགོ་འབྱེད་འབད་མ་ཚུགས།"
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས་  མཐུད་ལམ་ངལ་མཚམས།"
 
-#: methods/connect.cc:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s་ལུ་མཐུད་དོ།"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "'%s'མོས་མཐུན་འབད་མ་ཚུགས།"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "'%s'མོས་མཐུན་འབད་ནི་ལུ་གནས་སྐབས་ཀྱི་འཐུས་ཤོར།"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་པ་ཅིག་བྱུང་ཡི།"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་  འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་"
 "མ་ཚུགས?!"
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།"
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 "འོག་གི་མིང་རྟགས་ཚུ་བདེན་སྦྱོར་་འབད་མ་ཚུགས་ག་ཅི་སྦེ་ཟེར་བ་ཅིན་མི་དམང་ལྡེ་མིག་དེ་འཐོབ་མི་ཚུགས་པས:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "མགོ་ཡིག་ཚུ་གི་དོན་ལུ་བསྒ྄ག་དོ།"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "%u་ཡིག་འབྲུ་ཚུ་གི་ལྟག་ལས་མགོ་ཡིག་རྐྱང་པ་ཅིག་ཐོབ་ཡོད།"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "མགོ་ཡིག་གི་གྲལ་ཐིག་བྱང་ཉེས།"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ནུས་མེད་ལན་གསལ་གི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "ཨེཆི་ཊི་ཊི་པི་སར་བར་འདི་གིས་ནུས་མེད་ནང་དོན་རིང་-ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ནུས་མེད་ ནང་དོན་-ཁྱབ་ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ཁྱབ་ཚད་ཀྱི་རྒྱབ་སྐྱོར་དེ་ཆད་པ་བཟོ་བཏང་ནུག"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "ནང་འཁོད་འཛོལ་བ།"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "ཡིག་སྣོད་སྟོངམ་འདི་mmap་འབད་མ་ཚུགས།"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "%s་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།"
+
+#: apt-pkg/contrib/mmap.cc:311
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2345,93 +2362,93 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "ངོ་མ་ཤེས་པའི་སྡུད་ཚིག་གི་དབྱེ་བ:'%c'"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "་ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:  སྡེབ་ཚན་གྱིས་མིང་མེད་མི་དང་གཅིག་ཁར་འགོ་བཙུགསཔ་ཨིན"
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཟོ་ཉེས་འགྱུར་བའི་ངོ་རྟགས།"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:གནས་གོང་གི་ཤུལ་ལས་མཁོ་མེད་ཐེབས།"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཀོད་རྒྱ་ཚུ་ཆེ་རིམ་ནང་རྐྱངམ་ཅིག་བྱིན་ཚུགས།"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:འདུ་འཛོམས་འབད་འབདཝ་ལེ་ཤཱ་གྲངས་སུ་བཙུགསཔ་ཨིན།"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ནཱ་ལས་རང་འགོ་བཙུགས་གྲངས་སུ་བཙུགས་ཏེ་ཡོད།"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: རྒྱབ་སྐྱོར་མ་འབད་བར་ཡོད་པའི་'%s'བཀོད་རྒྱ།"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཀོད་རྒྱ་ཚུ་ཆེ་རིམ་ནང་རྐྱངམ་ཅིག་བྱིན་ཚུགས།"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ཡིག་སྣོད་ཀྱི་མཇུག་ལུ་མཁོ་མེད་ཐེབས།"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... འཛོལ་བ་!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... འབད་ཚར་ཡོད།"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "བརྡ་བཀོད་གྲལ་ཐིག་གྱི་གདམ་ཁ་'%c'[%s་ནང་ལས་]འདི་མ་ཤེས་པས།"
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "བ་རྡ་བཀོད་གྲལ་ཐིག་གི་གདམ་ཁ་%s་འདི་ཧ་མ་གོ་བས།"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "བརྡ་བཀོད་གྲལ་ཐིག་གི་གདམ་ཁ་%s་འདི་བུ་ལིན་མེན་པས།"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "གདམ་ཁ་%s་ལུ་སྒྲུབ་རྟགས་ཅིག་དགོ་པས།"
@@ -2441,345 +2458,363 @@ msgstr "གདམ་ཁ་%s་ལུ་སྒྲུབ་རྟགས་ཅི�
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "གདམ་ཁ་%s:རིམ་སྒྲིག་གི་རྣམ་གྲངས་གསལ་བཀོད་ལུ་ =<val> ་ཅིག་དགོཔ་ཨིན།"
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "གདམ་ཁ་ %s ་ལུ་'%s'་མེན་པར་ ཧྲིལ་ཨང་སྒྲུབ་རྟགས་ཅིག་དགོས་མཁོ་ཡོདཔ་ཨིན"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "གདམ་ཁ་'%s'འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག"
 
-#: 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 "དྲན་ཤེས་ %s་འདི་ཧ་གོ་མ་ཚུགས་པས་  བདེན་པ་ཡང་ན་རྫུན་པ་ལུ་འབད་རྩོལ་བསྐྱེདཔ།"
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "སྦྱར་བརྩེགས་ས་ཚིགས་%s་འདི་ངོ་བཤུས་འབད་མ་ཚུགས།"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚུགས།"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "སི་ཌི་རོམ་འདི་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "%s ལྷག་ནི་རྐྱངམ་ཅིག་འབད་མི་ལྡེ་མིག་ཡིག་སྣོད་འདི་གི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།"
 
-#: apt-pkg/contrib/fileutl.cc:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "ལྡེ་མིག་རྐྱབས་ཡོད་པའི་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "ཨེན་ཨེཕ་ཨེསི་ %s སྦྱར་བརྩེགས་འབད་ཡོད་པའི་ལྡེ་མིག་ཡིག་སྣོད་ཀྱི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "%sལྡེ་མིག་རྐྱབ་ནི་ལེན་མ་ཚུགས།"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "ཡན་ལག་ལས་སྦྱོར་ ཨའི་པི་སི་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "ཨེབ་འཕྲུལ་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "ལྷག་  ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག"
 
-#: apt-pkg/contrib/fileutl.cc:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "འབྲི་  ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།"
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་སྟོངམ།"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས།"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "ཐུམ་སྒྲིས་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ མི་མཐུན་པའི་འཐོན་རིམ་ཅིག་ཨིན་པས།"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས།"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "འ་ནི་ཨེ་པི་ཊི་ འདི་གིས་ '%s'འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་དེ་ལུ་རྒྱབ་སྐྱོར་མི་འབད་བས།"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་འདི་བཟོ་བཀོད་སོ་སོ་ཅིག་གི་དོན་ལུ་བཟོ་བརྩིགས་འབད་འབདཝ་ཨིནཔས།"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "རྟེནམ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "སྔོན་གོང་མ་རྟེནམ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "བསམ་འཆར་བཀོདཔ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "འོས་སྦྱོར་འབདཝ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "མི་མཐུནམ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "ཚབ་བཙུགསཔ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "ཕན་མེདཔ་བཟོཝ་ཨིན།"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "གལ་ཅན།"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "དགོས་མཁོ་ཡོདཔ།"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "ཚད་ལྡན།"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "གདམ་ཁ་ཅན།"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "ཐེབས།"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "རྟེན་འབྲེལ་གྱི་རྩ་འབྲེལ་བཟོ་བརྩིགས་འབད་དོ།"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "མི་ངོ་འཐོན་རིམཚུ།"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "བརྟེན་པའི་བཟོ་བཏོན།"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 #, fuzzy
 msgid "Reading state information"
 msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་  འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་  འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་  འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་  འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu འབྱུང་ཁུངས་ཐོ་ཡིག་ %s (ཡུ་ཨར་ཨའི་)གི་ནང་ན།"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(ཡང་དག་ dist)གི་ནང་ན།"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་  འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "%s་ཁ་ཕྱེ་དོ།"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག"
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
 
-#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, 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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2791,19 +2826,12 @@ msgstr ""
 "འདི་འབདཝ་ད་ཁྱོད་ཀྱི་ཐད་རི་འབའ་རི་འབད་དགོཔ་ཨིན་པ་ཅིན་ APT::Force-LoopBreak གདམ་ཁ་འདི་ཤུགས་"
 "ལྡན་བཟོ།"
 
-#: apt-pkg/packagemanager.cc:501
-#, 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
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་སྐྱོར་མ་འབད་བས།"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2811,7 +2839,7 @@ msgstr ""
 "ཐུམ་སྒྲིལ་%s་འདི་ལོག་འདི་རང་གཞི་བཙུགས་འབད་དགོཔ་འདུག་ འདི་འབདཝ་ད་འདི་གི་དོན་ལུ་ཡིག་མཛོད་ཅིག་འཚོལ་"
 "མ་ཐོབ།"
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2819,11 +2847,11 @@ msgstr ""
 "འཛོལ་བ་ pkgProblemResolver::གིས་བཟོ་བཏོན་འབད་ཡོད་པའི་མཚམས་དེ་ཚུ་མོས་མཐུན་བཟོཝ་ཨིན འ་ནི་ཐུམ་"
 "སྒྲིལ་ཚུ་འཛིན་པའི་རྒྱུ་རྐྱེན་ལས་བརྟེན་ཨིན་པས།"
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག"
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2832,234 +2860,196 @@ msgstr ""
 "ཟུར་ཐོ་ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག་  འདི་ཚུ་སྣང་མེད་སྦེ་བཞགཔ་མ་ཚད་ ཚབ་ལུ་"
 "རྙིངམ་འདི་ཚུ་ལག་ལེན་འཐབ་ནུག"
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག"
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "ཡིག་མཛོད་སྣོད་ཐོ་ %s་ ཆ་ཤས་འདི་བརླག་སྟོར་ཞུགས་ཏེ་འདུག"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "%li་ གི་བརླག་སྟོར་ཞུགས་པའི་ཡིག་སྣོད་%li (%s ལྷག་ལུས་དོ།)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr " %li་གི་བརླག་སྟོར་ཟུགསཔའི་ཡིག་སྣོད་ %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འཐོབ།"
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་"
 
-#: apt-pkg/init.cc:147
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "སྦུང་ཚན་བཟོ་ནིའི་རིམ་ལུགས་ '%s' འདི་ལུ་རྒྱབ་སྐྱོར་མ་འབད་བས།"
 
-#: apt-pkg/init.cc:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "འོས་འབབ་དང་ལྡན་པའི་སྦུང་ཚན་རིམ་ལུགས་ཀྱི་དབྱེ་བ་ཅིག་གཏན་འབེབས་བཟོ་མི་ཚུགས་པས།"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "%s་ ངོ་བཤུས་འབད་མ་ཚུགས།"
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 "ཁྱོད་རའི་sources.listགི་ཐོ་ཡིག་ནང་ལུ་ཁྱོད་ཀྱི་ 'འབྱུང་ཁུངས་' ཡུ་ཨར་ཨའི་ཚུ་་ལ་ལུ་ཅིག་བཙུགས་དགོ"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཡང་ན་གནས་ཚད་ཡིག་སྣོད་ཚུ་ མིང་དཔྱད་ཡང་ན་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ནིའི་ལུ་ ཁྱོད་ཀྱི་ apt-get update་དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།"
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "དགའ་གདམ་ཡིག་སྣོད་ནང་ལུ་ནུས་མེད་ཀྱི་དྲན་ཐོ་  ཐུམ་སྒྲིལ་མགོ་ཡིག་མིན་འདུག"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "ངོ་རྟགས་ཨང་གི་དབྱེ་བ་ %s འདི་ཧ་གོ་མ་ཚུགས།"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "གོ་རྟགས་ཨང་གི་དོན་ལུ་ གཙོ་རིམ་(ཡང་ན་ ཀླད་ཀོར་)ཚུ་གསལ་བཀོད་མ་འབད་བས།"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "འདྲ་མཛོད་ལུ་མཐུན་འགྱུར་མེན་པའི་འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་ཅིག་འདུག"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "%s (ཐུམ་སྒྲིལ་གསརཔ་)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "%s (ལག་ལེན་འཐུམ་སྒྲིལ་ ༡་)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་འཐོན་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "%s (ཡིག་སྣོད་འཐོན་རིམ་གསརཔ་ ༡)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "%s (ལག་ལེན་འཐུམ་སྒྲིལ་ ༢་)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་འཐོན་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "%s (ཡིག་སྣོད་འཐོན་རིམ་གསརཔ་ ༡)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr " %s (འཐོན་རིམ་གསརཔ་ ༡་)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "%s (ལག་ལེན་ཐུམ་སྒྲིལ་ ༣་)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོབ་ཅིག་བྱུང་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "%s (ཡིག་སྣོད་འཐོན་རིམ་གསརཔ་ ༡)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག"
 
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "%s (CollectFileProvides)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།"
 
-#: apt-pkg/pkgcachegen.cc:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3067,12 +3057,12 @@ msgid ""
 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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3081,7 +3071,7 @@ msgstr ""
 " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
 "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)"
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3090,48 +3080,48 @@ msgstr ""
 " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
 "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག "
 
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག  ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།"
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "ཚད་མ་མཐུན།"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "%sསིལ་ཚོང་པ་སྡེབ་ཚན་གྱི་ནང་ན་མཛུབ་རྗེས་མིན་འདུག"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3140,64 +3130,64 @@ msgstr ""
 " %s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འཐབ་དོ།\n"
 "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་འབད་དོ།\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "ངོས་འཛིན་འབད་དོ.."
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་ཁ་ཡིག:%s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་མ་འབད་བར་བཞག་དོ..."
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr " %s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འཐབ་དོ།\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "སི་ཌི་-རོམ་བརྩེགས་བཤོལ་འབད་དོ།\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "ཌིསིཀ་གི་དོན་ལུ་བསྒུག་དོ...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་འབད་དོ...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་གི་དོན་ལུ་ ཌིསིཀ་ཞིབ་ལྟ་འབད་དོ..\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, fuzzy, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr "%i་ཐུམ་སྒྲིལ་གྱི་ཟུར་ཐོ་ཚུ་ཐོབ་ཅི་  %i་འབྱུང་ཁུངས་ཟུར་ཐོ་ཚུ་དང་ %iམིང་རྟགས་ཚུ།\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
 msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་ཁ་ཡིག:%s \n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "དེ་ནུས་ཅན་གྱི་མིང་ཅིག་མེན་པས་ ལོག་སྟེ་རང་འབད་རྩོལ་བསྐྱེད།\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3206,295 +3196,370 @@ msgstr ""
 "ཌིསིཀ་འདི་བོད་བརྡ་འབད་དོ་ཡོདཔ་ཨིན།\n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "ཐུམ་སྒྲིལ་གྱིཐོ་ཡིག་ཚུ་འདྲ་བཤུས་རྐྱབ་དོ..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "འབྱུང་ཁུངས་ཀྱི་ཐོ་ཡིག་གསརཔ་ཅིག་འབྲི་དོ།\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་ཁུངས་ཧྲིལ་བུ་ཚུ་:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i་དྲན་མཐོ་དེ་ཚུ་བྲིས་ཡོད།\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་ཡོད།\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i་མཐུན་སྒྲིག་མེདཔ་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i་དྲན་ཐོ་ཚུ་བྲིས་བཞག་ཡོདཔ་ཨིན།\n"
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་ %iམཐུན་སྒྲིག་མེད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་"
 "ཡོདཔ་ཨིན།\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འཐོབ་པས།"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "%s་རིམ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, 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:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལམ་འདི་ག་བསྡམས་ཡོད།"
 
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "ཨེབ་བཤོལ་འཕྲུལ་ཆས།"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "ལྷག་  ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "འབྲི་  ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "%s (ཐུམ་སྒྲིལ་གསརཔ་)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "%s (ལག་ལེན་འཐུམ་སྒྲིལ་ ༡་)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་འཐོན་ནུག"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "%s (ཡིག་སྣོད་འཐོན་རིམ་གསརཔ་ ༡)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "%s (ལག་ལེན་འཐུམ་སྒྲིལ་ ༢་)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་འཐོན་ནུག"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "%s (ཡིག་སྣོད་འཐོན་རིམ་གསརཔ་ ༡)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr " %s (འཐོན་རིམ་གསརཔ་ ༡་)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "%s (ལག་ལེན་ཐུམ་སྒྲིལ་ ༣་)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོབ་ཅིག་བྱུང་ནུག"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "%s (ཡིག་སྣོད་འཐོན་རིམ་གསརཔ་ ༡)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "%s (CollectFileProvides)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "ནང་འཁོད་འཛོལ་བ་  འཐུས་མི་ག་ཡོད་འཚོལ་མ་ཐོབ།"
 
diff --git a/po/el.po b/po/el.po
index 8bf8aee22..4314c7b08 100644
--- a/po/el.po
+++ b/po/el.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_el\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+0200\n"
 "PO-Revision-Date: 2008-08-26 18:25+0300\n"
 "Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -27,152 +27,153 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Το πακέτο %s με έκδοση %s έχει ανικανοποίητες εξαρτήσεις:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Συνολικά Ονόματα Πακέτων : "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Συνολικά Ονόματα Πακέτων : "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Κανονικά Πακέτα: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr " Πλήρως Εικονικά Πακέτα: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr " Μονά Εικονικά Πακέτα: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr " Μικτά Εικονικά Πακέτα: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "Αγνοούμενα: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Σύνολο Διαφορετικών Εκδόσεων: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Σύνολο Διαφορετικών Εκδόσεων: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Σύνολο Εξαρτήσεων: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Σύνολο Αντιστοιχίσεων Παροχών: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Σύνολο Κοινών Στοιχειοσειρών : "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Συνολικός χώρος Εξαρτήσεων Εκδόσεων: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Σύνολο χώρου ασφαλείας: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Συνολικός Καταμετρημένος Χώρος: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμένο."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Δε βρέθηκαν πακέτα"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Πρέπει να δώσετε ακριβώς μία παράσταση"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Αδυναμία εντοπισμού του πακέτου %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Αρχεία Πακέτου:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Καθηλωμένα Πακέτα:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(δε βρέθηκαν)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Εγκατεστημένα: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Υποψήφιο: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(κανένα)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr " Καθήλωση Πακέτου: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Πίνακας Έκδοσης:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -247,30 +248,30 @@ msgstr ""
 "  -o=? Χρήση μιας αυθαίρετη επιλογής ρυθμίσεων, πχ -o dir::cache=/tmp\n"
 "Δείτε τις σελίδες man του apt-cache(8) και apt.conf(5) για πληροφορίες.\n"
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 #, 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:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Παρακαλώ εισάγετε το δίσκο στη συσκευή και πατήστε enter"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Αποτυχία μετονομασίας του %s σε %s"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Επαναλάβετε την διαδικασία για τα υπόλοιπα CD από το σετ σας."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Τα ορίσματα δεν είναι σε ζεύγη"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -299,12 +300,12 @@ msgstr ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "Το %s δεν είναι έγκυρο πακέτο DEB."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -328,40 +329,40 @@ msgstr ""
 "  -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
 "  -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Αδύνατη η εγγραφή στο %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Δεν βρέθηκε η έκδοση του debconf. Είναι το debconf εγκατεστημένο;"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Ο κατάλογος επεκτάσεων του πακέτου είναι υπερβολικά μακρύς"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Ο κατάλογος επεκτάσεων των πηγών είναι υπερβολικά μακρύς"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Σφάλμα εγγραφής κεφαλίδων στο αρχείο περιεχομένων"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Σφάλμα επεξεργασίας περιεχομένων του %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -445,26 +446,26 @@ msgstr ""
 "  -c=?  Χρήση αυτού του αρχείου ρυθμίσεων\n"
 "  -o=?  Ορισμός αυθαίρετης επιλογής ρύθμισης"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Δεν ταιριαξε καμία επιλογή"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Λείπουν μερικά αρχεία από την ομάδα πακέτων '%s'"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "Η βάση είναι κατεστραμμένη, το αρχείο μετονομάστηκε σε %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "Η βάση δεν είναι ενημερωμένη, γίνεται προσπάθεια να αναβαθμιστεί το %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 #, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
@@ -473,111 +474,111 @@ msgstr ""
 "Το φορμά της βάσης δεν είναι έγκυρο. Εάν αναβαθμίσατε το apt σε νεότερη "
 "έκδοση, παρακαλώ αφαιρέστε και δημιουργήστε τη βάση εκ νέου."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, 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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Αποτυχία εύρεσης της κατάστασης του %s."
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχου"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Αδύνατη η πρόσβαση σε δείκτη"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Αδύνατη η ανάγνωση του καταλόγου  %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Αδύνατη η εύρεση της κατάστασης του %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: Σφάλματα στο αρχείο"
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Αδύνατη η εύρεση του %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Αποτυχία ανεύρεσης"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Αποτυχία ανοίγματος του %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr "Αποσύνδεση %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Αποτυχία ανάγνωσης του %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Αποτυχία αποσύνδεσης του %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "    Αποτυχία σύνδεσης του %s με το %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Αποσύνδεση ορίου του %sB hit.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s δεν περιέχει εγγραφή παράκαμψης\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: 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:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s δεν έχει εγγραφή πηγαίας παράκαμψης\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realoc - Αδυναμία εκχώρησης μνήμης"
 
@@ -587,18 +588,18 @@ msgid "Unable to open %s"
 msgstr "Αδύνατο το άνοιγμα του %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -606,63 +607,51 @@ msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu
 msgid "Failed to read the override file %s"
 msgstr "Αποτυχία ανάγνωσης του αρχείου παράκαμψης %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Άγνωστος Αλγόριθμος Συμπίεσης '%s'"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Η συμπιεσμένη έξοδος του %s χρειάζεται καθορισμό συμπίεσης"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Αποτυχία κατά τη δημιουργία διασωλήνωσης IPC στην υποδιεργασία"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Αποτυχία δημιουργίας του ΑΡΧΕΙΟΥ"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Αποτυχία αγκίστρωσης"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Συμπίεση απογόνου"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Εσωτερικό Σφάλμα, Αποτυχία δημιουργίας του %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Αποτυχία δημιουργίας IPC στην υποδιεργασία"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Αποτυχία εκτέλεσης του συμπιεστή "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "αποσυμπιεστής"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "απέτυχε η Ε/Ε στην υποδιεργασία/αρχείο"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Αποτυχία ανάγνωσης κατά τον υπολογισμό MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Πρόβλημα κατά την αποσύνδεση του %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Αποτυχία μετονομασίας του %s σε %s"
@@ -671,75 +660,79 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "σφάλμα μεταγλωτισμου - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "αλλά το %s είναι εγκατεστημένο"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "αλλά το %s πρόκειται να εγκατασταθεί"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "αλλά δεν είναι εγκαταστάσημο"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "αλλά είναι ένα εικονικό πακέτο"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "αλλά δεν είναι εγκατεστημένο"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "αλλά δεν πρόκειται να εγκατασταθεί"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " η"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (λόγω του %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -747,60 +740,60 @@ msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n"
 "Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu επανεγκατεστημένα,"
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu υποβαθμισμένα, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Το πακέτο %s είναι εικονικό και παρέχεται από τα:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Εγκατεστημένα]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 #, fuzzy
 msgid " [Not candidate version]"
 msgstr "Υποψήφιες Εκδόσεις"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Θα πρέπει επακριβώς να επιλέξετε ένα για εγκατάσταση."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -812,133 +805,133 @@ msgstr ""
 "Αυτό σημαίνει ότι το πακέτο αυτό λείπει, είναι παλαιωμένο, ή είναι διαθέσιμο "
 "από άλλη πηγή\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Πάραυτα το ακόλουθο πακέτο το αντικαθιστά:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Το πακέτο %s δεν είναι υποψήφιο για εγκατάσταση"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή "
 "του\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Διόρθωση εξαρτήσεων..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " απέτυχε."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Αδύνατη η διόρθωση των εξαρτήσεων"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Ετοιμο"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 "Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
 "προβλήματα."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση [ν/Ο]; "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Υπάρχουν προβλήματα και δώσατε -y  χωρίς το --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Πολύ περίεργο! Τα μεγέθη δεν ταιριάζουν, στείλτε μήνυμα στο apt@packages."
@@ -946,21 +939,21 @@ 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:1142
+#: cmdline/apt-get.cc:1156
 #, 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:1147
+#: cmdline/apt-get.cc:1161
 #, 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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -968,31 +961,31 @@ 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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n"
 
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο  %s."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία"
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Ναι, κανε ότι λέω!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1003,28 +996,28 @@ msgstr ""
 "Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Εγκατάλειψη."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Θέλετε να συνεχίσετε [Ν/ο]; "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Αποτυχία ανάκτησης του %s   %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1032,20 +1025,20 @@ msgstr ""
 "Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update "
 "ή το --fix-missing;"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Αδύνατη η επίλυση των χαμένων πακέτων."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Εγκατάλειψη της εγκατάστασης."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1055,36 +1048,36 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Η εντολή update δεν παίρνει ορίσματα"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Δεν επιτρέπεται οποιαδήποτε διαγραφή· αδυναμία εκκίνησης του AutoRemover"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1102,15 +1095,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Εσωτερικό Σφάλμα, το AutoRemover δημιούργησε κάποιο πρόβλημα"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1122,7 +1115,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1132,19 +1125,19 @@ msgstr[0] ""
 msgstr[1] ""
 "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Χρησιμοποιήστε 'apt-get autoremove' για να τα διαγράψετε."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1152,7 +1145,7 @@ msgstr ""
 "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
 "πακέτο (ή καθορίστε μια λύση)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1164,84 +1157,84 @@ msgstr ""
 "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
 "μετακινηθεί από τα εισερχόμενα."
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Χαλασμένα πακέτα"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Προτεινόμενα πακέτα:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Συνιστώμενα πακέτα:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Αδύνατη η εύρεση του πακέτου %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Υπολογισμός της αναβάθμισης... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Απέτυχε"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Ετοιμο"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο "
 "υλικό"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
 "κωδικάτου"
 
-#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1249,86 +1242,86 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Μεταφόρτωση Κωδικα %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
 
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
 
-#: cmdline/apt-get.cc:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Η απογονική διεργασία απέτυχε"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
 
-#: cmdline/apt-get.cc:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
 
-#: cmdline/apt-get.cc:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1336,7 +1329,7 @@ msgid ""
 msgstr ""
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1344,14 +1337,14 @@ msgid ""
 msgstr ""
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
 "είναι νεώτερο"
 
-#: cmdline/apt-get.cc:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1360,7 +1353,7 @@ msgstr ""
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
 "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης"
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1368,30 +1361,30 @@ msgid ""
 msgstr ""
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Σύνδεση στο %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Υποστηριζόμενοι Οδηγοί:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1476,7 +1469,7 @@ msgstr ""
 "για περισσότερες πληροφορίες και επιλογές.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1484,33 +1477,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Hit "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Φέρε:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Αγνόησε "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Σφάλμα "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Μεταφορτώθηκαν %sB σε %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Επεξεργασία]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1521,46 +1514,62 @@ msgstr ""
 " '%s'\n"
 "στη συσκευή '%s' και πιέστε  enter\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "αλλά δεν είναι εγκατεστημένο"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Αποτυχία ανοίγματος του %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1582,11 +1591,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Άγνωστη εγγραφή πακέτου!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1651,196 +1660,198 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Αποτυχία κατά τη δημιουργία διασωληνώσεων"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Αποτυχία κατά την εκτέλεση του gzip "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Κατεστραμμένη αρχειοθήκη"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Το Checksum του tar απέτυχε, η αρχείοθήκη είναι κατεστραμμένη"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Άγνωστη επικεφαλίδα TAR τύπος %u, μέλος %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Μη έγκυρη υπογραφή αρχειοθήκης"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Σφάλμα κατά την ανάγνωση της επικεφαλίδας του μέλους της αρχειοθήκης"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, fuzzy, c-format
 msgid "Invalid archive member header %s"
 msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Η αρχειοθήκη είναι πολύ μικρή"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Αποτυχία ανάγνωσης των επικεφαλίδων της αρχειοθήκης"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "Κλήση του DropNode σε έναν ήδη συνδεδεμένο κόμβο"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Αποτυχία εντοπισμού του στοιχείου hash!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Αδυναμία εντοπισμού εκτροπής"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Εσωτερικό Σφάλμα στο AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Προσπάθεια για αντικατάσταση εκτροπής, %s -> %s και %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Διπλή προσθήκη εκτροπής %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Διπλό αρχείο ρυθμίσεων %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Αποτυχία εγγραφής του αρχείου %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Αποτυχία στο κλείσιμο του αρχείου %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Η διαδρομή %s έχει υπερβολικό μήκος"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Αποσυμπίεση του %s πάνω από μια φορά"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Ο φάκελος %s έχει εκτραπεί"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Το πακέτο προσπαθεί να γράψει στον προορισμό εκτροπής %s/%s"
 
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Η διαδρομή εκτροπής έχει υπερβολικό μήκος"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Ο φάκελος %s αντικαθίσταται από ένα μη-φάκελο"
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "Αποτυχία εντοπισμού του κόμβου στην ομάδα hash του"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Η διαδρομή έχει υπερβολικό μήκος"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Αντικατάσταση πακέτου χωρίς καμία έκδοση %s"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέτο %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Αδύνατη η ανάγνωση του %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Αδύνατη η εύρεση της κατάστασης του %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Αποτυχία διαγραφής του %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Αδύνατη η δημιουργία του %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Αποτυχία εύρεσης της κατάστασης του %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Οι φάκελοι info και temp πρέπει να βρίσκονται στο ίδιο σύστημα αρχείων"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Ανάγνωση Λιστών Πακέτων"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Αποτυχία αλλαγής καταλόγου στο φάκελο διαχείρισης %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Εσωτερικό Σφάλμα στην ανάκτηση ενός Ονόματος Πακέτου"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Ανάγνωση Λίστας Πακέτων"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1851,114 +1862,115 @@ msgstr ""
 "επαναφέρετε το αρχείο, τότε αδειάστε το και άμεσα εγκαταστήστε ξανά την ίδια "
 "έκδοση του πακέτου!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Αποτυχία κατά την ανάγνωση του αρχείου λίστας %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Εσωτερικό Σφάλμα στη λήψη ενός Κόμβου"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Αποτυχία στο άνοιγμα του αρχείου παρακάμψεων  %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 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
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Εσωτερικό Σφάλμα στην προσθήκη μιας παράκαμψης"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "Η cache των πακέτων θα πρέπει να πρώτα να αρχικοποιηθεί"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Αποτυχία εύρεσης μιας κεφαλίδας Package:, γραμμή %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Ελαττωματική εγγραφή ConfFile στο αρχείο κατάστασης. Γραμμή %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Σφάλμα στην ανάλυση του MD5. Γραμμή  %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Αυτό δεν είναι ένα έγκυρο αρχείο DEB, αγνοείται το μέλος '%s'"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 "Αυτό δεν είναι ένα έγκυρο αρχείο DEB, δεν περιέχει το μέλος '%s', '%s' ή '%s'"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Αδύνατη η αλλαγή σε %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Εσωτερικό Σφάλμα, αδυναμία εντοπισμού του μέλους %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Αποτυχία εντοπισμού ενός έγκυρου αρχείου control"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Μη αναλύσιμο αρχείο control"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Αποτυχία εύρεσης της κατάστασης"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Αδύνατη η ανάγνωση της βάσης δεδομένων του cdrom %s"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1966,56 +1978,56 @@ msgstr ""
 "Παρακαλώ χρησιμοποιείστε το apt-cdrom για να αναγνωριστεί αυτό το CD από το "
 "APT. Το apt-get update δε χρησιμεύει για να προσθέτει νέα CD"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "Λάθος CD"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Αδυναμία απόσυναρμογής του CD-ROM στο %s, μπορεί να είναι σε χρήση."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Ο δίσκος δεν βρέθηκε."
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Το αρχείο Δε Βρέθηκε"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Μη έγκυρο URI, τα τοπικά URI δεν πρέπει να αρχίζουν με //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Σύνδεση στο σύστημα"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Αδύνατος ο καθορισμός του ονόματος του ομότιμου (peer)"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Αδύνατος ο καθορισμός του τοπικού ονόματος"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Ο διακομιστής αρνήθηκε την σύνδεση με μήνυμα: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Η εντολή USER απέτυχε, ο διακομιστής απάντησε: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Η εντολή PASS απέτυχε, ο διακομιστής απάντησε: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2023,201 +2035,201 @@ msgstr ""
 "Ο διαμεσολαβητής έχει οριστεί αλλά χωρίς σενάριο εισόδου, το Acquire::ftp::"
 "ProxyLogin είναι άδειο"
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Η εντολή '%s' στο σενάριο εισόδου απέτυχε, ο διακομιστής απάντησε: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Η εντολή TYPE απέτυχε, ο διακομιστής απάντησε: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Λήξη χρόνου σύνδεσης"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Ο διακομιστής έκλεισε την σύνδεση"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Σφάλμα ανάγνωσης"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Το μήνυμα απάντησης υπερχείλισε την ενδιάμεση μνήμη."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Αλλοίωση του πρωτοκόλλου"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Σφάλμα εγγραφής"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Αδύνατη η δημιουργία μιας υποδοχής (socket)"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "Αδύνατη η σύνδεση υποδοχής δεδομένων, λήξη χρόνου σύνδεσης"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Αδύνατη η σύνδεση σε παθητική υποδοχή (socket)."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Το getaddrinfo ήταν αδύνατο να δέσμευση υποδοχή παρακολούθησης"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Αδύνατη η πρόσδεση στην υποδοχή (socket)"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Αδύνατη η παρακολούθηση της υποδοχής (socket)"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Αδύνατος ο καθορισμός του ονόματος της υποδοχής (socket)"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Αδύνατη η αποστολή της εντολής PORT"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Άγνωστη οικογένεια διευθύνσεων %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Το EPRT απέτυχε, ο διακομιστής απάντησε: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδομένων"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Αδύνατη η αποδοχή συνδέσεων"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Πρόβλημα κατά το hashing του αρχείου"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Αδυναμία λήψης του αρχείου, ο διακομιστής απάντησε '%s'"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Λήξη χρόνου υποδοχής δεδομένων"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Αποτυχία κατά τη μεταφορά δεδομένων, ο διακομιστής απάντησε '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Επερώτηση"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Αδύνατη η εκτέλεση"
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Σύνδεση στο %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Αδύνατη η αρχικοποίηση της σύνδεσης στο %s:%s (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Αδύνατη η σύνδεση στο %s:%s (%s), λήξη χρόνου σύνδεσης"
 
-#: methods/connect.cc:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Σύνδεση στο %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Αδύνατη η εύρεση του '%s'"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Προσωρινή αποτυχία στην εύρεση του '%s'"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Αδύνατη η σύνδεση στο %s %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του "
 "αποτυπώματος?!"
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Αδυναμία εκτέλεσης του '%s' για την επαλήθευση της υπογραφής (είναι "
 "εγκατεστημένο το gpgv;)"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2225,124 +2237,129 @@ msgstr ""
 "Οι παρακάτω υπογραφές δεν ήταν δυνατόν να επαληθευτούν επειδή δεν ήταν "
 "διαθέσιμο το δημόσιο κλειδί:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Αναμονή επικεφαλίδων"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Ελαττωματική γραμμή επικεφαλίδας"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Άγνωστη μορφή ημερομηνίας"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Η επιλογή απέτυχε"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Λήξη χρόνου σύνδεσης"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "Αποτυχία εγγραφής του αρχείου %s"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Εσωτερικό Σφάλμα"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Αδύνατη η απεικόνιση mmap ενός άδειου αρχείου"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "Αδύνατο το άνοιγμα του %s"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "Αδύνατη η εκτέλεση"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:311
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Αποτυχία εγγραφής του αρχείου %s"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2371,95 +2388,95 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Η επιλογή %s δε βρέθηκε"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Μη αναγνωρισμένος τύπος σύντμησης: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Συντακτικό σφάλμα %s:%u: Το block αρχίζει χωρίς όνομα."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Συντακτικό σφάλμα %s:%u: Λάθος μορφή Ετικέτας (Tag)"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες μετά την τιμή"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Συντακτικό σφάλμα %s:%u: Υπερβολικός αριθμός συνδυασμένων includes"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Συντακτικό σφάλμα %s:%u: Συμπεριλαμβάνεται από εδώ"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Συντακτικό σφάλμα %s:%u: Μη υποστηριζόμενη εντολή '%s'"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες στο τέλος του αρχείου"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Σφάλμα!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Ολοκληρώθηκε"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Η επιλογή γραμμής εντολών '%c' [από %s] δεν είναι γνωστή."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Η επιλογή γραμμής εντολών %s δεν είναι κατανοητή"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Η επιλογή γραμμής εντολών %s δεν είναι boolean"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Η επιλογή %s απαιτεί ένα όρισμα."
@@ -2470,346 +2487,364 @@ msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 "Επιλογή %s: Οι προδιαγραφές του αντικειμένου ρυθμίσεων απαιτούν =<val>."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Επιλογή %s: απαιτείται ένας ακέραιος αριθμός ως όρισμα, όχι '%s'"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Η επιλογή '%s' έχει υπερβολικό μήκος"
 
-#: 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 "Η τιμή %s δεν είναι κατανοητή, δοκιμάστε σωστό (true) ή λάθος (false)."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Μη έγκυρη λειτουργία %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Αδύνατη η εύρεση της κατάστασης του σημείου επαφής %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Αδύνατη η αλλαγή σε %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Αδύνατη η εύρεση της κατάστασης του cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Δε θα χρησιμοποιηθεί κλείδωμα για το ανάγνωσης μόνο αρχείο κλειδώματος %s"
 
-#: apt-pkg/contrib/fileutl.cc:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Αδύνατο το άνοιγμα του αρχείου κλειδώματος %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Δε θα χρησιμοποιηθεί κλείδωμα για το συναρμοσμένο από nfs αρχείο κλειδώματος "
 "%s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Αδύνατο το κλείδωμα %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Αποτυχία δημιουργίας IPC στην υποδιεργασία"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Αποτυχία εκτέλεσης του συμπιεστή "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα"
 
-#: apt-pkg/contrib/fileutl.cc:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία"
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Πρόβλημα κατά την διαγραφή του αρχείου"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Άδειο cache πακέτων"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "Το αρχείο cache των πακέτων είναι ασύμβατης έκδοσης"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Αυτό το APT δεν υποστηρίζει το Σύστημα Απόδοσης Έκδοσης '%s'"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "Η cache πακέτων κατασκευάστηκε για μια διαφορετική αρχιτεκτονική"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Εξαρτάται από"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "ΠροΕξαρτάται από"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Προτείνει"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Συστήνει"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Ασύμβατο με"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Αντικαθιστά"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Απαρχαιώνει"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Χαλάει"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "σημαντικό"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "απαιτούμενο"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "καθιερωμένο"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "προαιρετικό"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "επιπλέον"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Κατασκευή Δένδρου Εξαρτήσεων"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Υποψήφιες Εκδόσεις"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Παραγωγή Εξαρτήσεων"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Ανάγνωση περιγραφής της τρέχουσας κατάσταση"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Αποτυχία ανοίγματος του αρχείου κατάστασης %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Αποτυχία εγγραφής του αρχείου κατάστασης %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Άνοιγμα του %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
 
-#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, 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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2821,19 +2856,12 @@ msgstr ""
 "είναι καλό, αλλά εάν πραγματικά θέλετε να συνεχίσετε ενεργοποιήστε την "
 "επιλογή APT::Force-LoopBreak option."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2841,7 +2869,7 @@ msgstr ""
 "Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση "
 "κάποιας κατάλληλης αρχείοθήκης."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2849,11 +2877,11 @@ msgstr ""
 "Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως "
 "προκλήθηκε από κρατούμενα πακέτα."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα."
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2862,240 +2890,202 @@ msgstr ""
 "Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα "
 "στη θέση τους."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Ο φάκελος λιστών %spartial αγνοείται."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Ο φάκελος αρχειοθηκών %spartial αγνοείται."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "Αδύνατο το κλείδωμα του καταλόγου"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Κατέβασμα του αρχείου %li του %li (απομένουν %s)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Λήψη αρχείου %li του %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπιστεί."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
 "enter."
 
-#: apt-pkg/init.cc:147
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται"
 
-#: apt-pkg/init.cc:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Αδύνατη η εύρεση της κατάστασης του %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών' στο sources.list"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Αδύνατο το άνοιγμα ή η ανάλυση των λιστών πακέτων ή του αρχείου κατάστασης."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Μη έγκυρη εγγραφή στο αρχείο προτιμήσεων, καμία επικεφαλίδα Package"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Αδύνατη η κατανόηση του τύπου καθήλωσης %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 "Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion1)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Εκπληκτικό, υπερβήκατε τον αριθμό των ονομάτων πακέτων που υποστηρίζει το "
 "APT."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Εκπληκτικό, υπερβήκατε τον αριθμό των περιγραφών που υποστηρίζει το APT."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT."
 
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου"
 
-#: apt-pkg/pkgcachegen.cc:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Συλλογή Παροχών Αρχείου"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "Ανόμοιο MD5Sum"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Ανόμοιο MD5Sum"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3103,12 +3093,12 @@ msgid ""
 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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3117,7 +3107,7 @@ msgstr ""
 "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
 "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3126,7 +3116,7 @@ msgstr ""
 "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
 "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο."
 
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3134,41 +3124,41 @@ msgstr ""
 "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
 "πακέτο %s."
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Ανόμοιο μέγεθος"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Η εγγραφή κατασκευαστή %s δεν περιέχει ταυτότητα"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3177,41 +3167,41 @@ msgstr ""
 "Χρησιμοποιείται το σημείο προσάρτησης %s\n"
 "Προσαρτάται το CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Αναγνώριση..."
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Αποθήκευση Ετικέτας: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "Αποπροσάρτηση του CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Χρησιμοποιείται το σημείο προσάρτησης %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Αποπροσάρτηση του CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Αναμονή για δίσκο...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Προσάρτηση του CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Σάρωση του δίσκου για περιεχόμενα...\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3220,22 +3210,22 @@ msgstr ""
 "Βρέθηκαν %zu κατάλογοι πακέτων, %zu κατάλογοι πηγαίων, %zu κατάλογοι "
 "μεταφράσεων και %zu υπογραφές\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Εύρεση ετικέτας: %s \n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Αυτό δεν είναι έγκυρο όνομα, προσπαθείστε ξανά. \n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3244,295 +3234,369 @@ msgstr ""
 "Ο δίσκος αυτός ονομάζεται: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Αντιγραφή λιστών πακέτων..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Eγγραφή νέας λίστας πηγών\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Εγιναν %i εγγραφές.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία.\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\n"
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Ανόμοιο MD5Sum"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Εγκατάλειψη της εγκατάστασης."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Αδύνατη η εύρεση του πακέτου %s"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "Εγκατάσταση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Ρύθμιση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Αφαιρώ το %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Το %s διαγράφηκε πλήρως"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Ο φάκελος %s αγνοείται."
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Προετοιμασία του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Ξεπακετάρισμα του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Προετοιμασία ρύθμισης του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "Έγινε εγκατάσταση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Προετοιμασία για την αφαίρεση του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "Αφαίρεσα το %s"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Προετοιμασία πλήρης αφαίρεσης του %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "Το %s διαγράφηκε πλήρως"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Αδυναμία εγγραφής στο αρχείο γεγονότων, λόγω αποτυχίας του openpyt() (είναι "
 "προσαρτημένο το /dev/pts;)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, 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:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Η σύνδεση έκλεισε πρόωρα"
 
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "αποσυμπιεστής"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr ""
+#~ "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Εσωτερικό Σφάλμα, αδυναμία εντοπισμού του μέλους"
 
diff --git a/po/es.po b/po/es.po
index f7d900d6b..1d217498b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -32,8 +32,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.10\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -72,151 +72,152 @@ msgstr ""
 "X-POFile-SpellExtra: autoclean showsrc desactualizados clean gzip TYPE\n"
 "X-POFile-SpellExtra: sinfo Acquire\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "El paquete %s versión %s tiene dependencias incumplidas:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Nombres de paquetes totales: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Estructuras de paquetes totales: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Paquetes normales: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Paquetes virtuales puros: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Paquetes virtuales únicos: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Paquetes virtuales mixtos: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Faltan: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Versiones diferentes totales: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Descripciones diferentes totales: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Dependencias totales: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Relaciones versión/archivo totales: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Relaciones descripción/archivo totales: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Mapeo Total de Provisiones: "
 
 # globbed -> globalizadas ? (jfs)
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Cadenas globalizadas totales: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Espacio de versión de dependencias total: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Espacio desperdiciado total: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Espacio registrado total: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "El archivo de paquetes %s está desincronizado."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "No se encontró ningún paquete"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "Debe proporcionar al menos un patrón de búsqueda"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "No se ha podido localizar el paquete %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Archivos de paquetes:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Paquetes con pin:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(no encontrado)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Instalados: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Pin del paquete: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Tabla de versión:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -294,29 +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:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 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:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "No se pudo montar «%s» como «%s»"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 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."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Argumentos no emparejados"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -345,12 +346,12 @@ msgstr ""
 "  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n"
 "       cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s no es un paquete DEB válido."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -375,40 +376,40 @@ msgstr ""
 "  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::"
 "cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "No se puede escribir en %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "No se puede encontrar la versión de debconf. ¿Está debconf instalado?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "La lista de extensión de paquetes es demasiado larga"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Error procesando el directorio %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "La lista de extensión de fuentes es demasiado larga"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Error escribiendo cabeceras de archivos de contenido"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Error procesando contenidos %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -493,26 +494,26 @@ msgstr ""
 "  -c=?  Lee este archivo de configuración\n"
 "  -o=?  Establece una opción de configuración arbitraria"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Ninguna selección coincide"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Faltan algunos archivos en el grupo de archivo de paquetes «%s»"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "BD dañada, se renombró el archivo a %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB anticuada, intentando actualizar %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -520,111 +521,111 @@ msgstr ""
 "El formato de la base de datos no es válido. Debe eliminar y recrear la base "
 "de datos si vd. se actualizó de una versión anterior de apt."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "No se pudo abrir el archivo DB %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "No pude leer %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "No hay registro de control del archivo"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "No se pudo obtener un cursor"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A: No se pudo leer directorio %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "A: No se pudo leer %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "A: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: Errores aplicables al archivo "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "No se pudo resolver %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Falló el recorrido por el árbol."
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "No se pudo abrir %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "No se pudo leer el enlace %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "No se pudo desligar %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** No pude enlazar %s con %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink se ha llegado al límite de %sB.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Archivo no tiene campo de paquetes"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr " %s no tiene entrada de predominio\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr " el encargado de %s es %s y no %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr " %s no tiene una entrada fuente predominante\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr " %s tampoco tiene una entrada binaria predominante\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - No pudo reservar memoria"
 
@@ -634,18 +635,18 @@ msgid "Unable to open %s"
 msgstr "No se pudo abrir %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Predominio mal formado %s línea %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Predominio mal formado %s línea %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Predominio mal formado %s línea %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -653,63 +654,51 @@ msgstr "Predominio mal formado %s línea %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "No se pudo leer el archivo de predominio %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Algoritmo desconocido de compresión «%s»"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Salida comprimida %s necesita una herramienta de compresión"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Falló la creación de una tubería IPC para el subproceso"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "No se pudo crear FICHERO*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "No se pudo bifurcar"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Hijo compresión"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Error interno, no se pudo crear %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "No se pudo crear el subproceso IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "No se pudo ejecutar el compresor "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "decompresor"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "Falló la ES a subproceso/archivo"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "No se pudo leer mientras se computaba MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Se produjo un problema al desligar %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Falló el renombre de %s a %s"
@@ -718,75 +707,79 @@ msgstr "Falló el renombre de %s a %s"
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Error de compilación de expresiones regulares - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "pero %s está instalado"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "pero %s va a ser instalado"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "pero no es instalable"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "pero es un paquete virtual"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "pero no está instalado"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "pero no va a instalarse"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " o"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Se instalarán los siguientes paquetes NUEVOS:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Los siguientes paquetes se ELIMINARÁN:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Los siguientes paquetes se han retenido:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Se actualizarán los siguientes paquetes:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Se DESACTUALIZARÁN los siguientes paquetes:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Se cambiarán los siguientes paquetes retenidos:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (por %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -794,59 +787,59 @@ msgstr ""
 "AVISO: Se van a eliminar los siguientes paquetes esenciales.\n"
 "¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu actualizados, %lu se instalarán, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu desactualizados, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu para eliminar y %lu no actualizados.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu no instalados del todo o eliminados.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Nota, seleccionando «%s» para la tarea «%s»\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Nota, seleccionando «%s» para la expresión regular «%s»\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "El paquete %s es un paquete virtual provisto por:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Instalado]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr " [No es la versión candidata]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Necesita seleccionar explícitamente uno para instalar."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -857,130 +850,130 @@ msgstr ""
 "a él. Esto puede significar que el paquete falta, está obsoleto o sólo se\n"
 "encuentra disponible desde alguna otra fuente\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Sin embargo, los siguientes paquetes lo reemplazan:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "El paquete «%s» no tiene un candidato para la instalación"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "No pueden eliminarse los paquetes virtuales como «%s»\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Nota, seleccionando «%s» en lugar de «%s»\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Ignorando %s, ya está instalado y no está activada la actualización.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Ignorando %s, no está instalado y sólo se están solicitando "
 "actualizaciones.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ya está en su versión más reciente.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "fijado %s como instalado manualmente.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versión seleccionada «%s» (%s) para «%s»\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Versión seleccionada «%s» (%s) para «%s»\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "El paquete %s no está instalado, no se eliminará\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Corrigiendo dependencias..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " falló."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "No se puede corregir las dependencias"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "No se puede minimizar el conjunto de actualización"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Listo"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Tal vez quiera ejecutar «apt-get -f install» para corregirlo."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISO: ¡No se han podido autenticar los siguientes paquetes!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Aviso de autenticación ignorado.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "¿Instalar estos paquetes sin verificación [s/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Algunos paquetes no se pueden autenticar"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Hay problemas y se utilizó -y sin --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Error interno, ¡se llamó a «InstallPackages» con paquetes rotos!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "Los paquetes necesitan eliminarse pero está deshabilitado la posibilidad de "
 "eliminar."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error interno, no terminó la ordenación"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Qué raro.. Los tamaños no concuerdan, mande un correo a apt@packages.debian."
@@ -988,21 +981,21 @@ 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Se necesita descargar %sB/%sB de archivos.\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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Necesito descargar %sB de archivos.\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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -1010,31 +1003,31 @@ 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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 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:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "No pude determinar el espacio libre en %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "No tiene suficiente espacio libre en %s."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Se especificó Trivial Only pero ésta no es una operación trivial."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Sí, ¡haga lo que le digo!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1045,28 +1038,28 @@ msgstr ""
 "Para continuar escriba la frase «%s»\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Abortado."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "¿Desea continuar [S/n]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Imposible obtener %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "No se pudieron descargar algunos archivos"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Descarga completa y en modo de sólo descarga"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1074,19 +1067,19 @@ msgstr ""
 "No se pudieron obtener algunos archivos, ¿quizás deba ejecutar «apt-get "
 "update» o deba intentarlo de nuevo con --fix-missing?"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "Actualmente no están soportados --fix-missing e intercambio de medio"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "No se pudieron corregir los paquetes que faltan."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Abortando la instalación."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1100,36 +1093,36 @@ msgstr[1] ""
 "Los paquetes mostrados a continuación han desaparecido de su sistema\n"
 "dado que todos sus ficheros han sido sobreescritos por otros paquetes:"
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Nota: Dpkg realiza esto de forma automática y a propósito."
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Ignorar la distribución objetivo no disponible «%s» del paquete «%s»"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Escogiendo «%s» como paquete fuente en lugar de «%s»\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Ignorar la versión no disponible «%s» del paquete «%s»"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "El comando de actualización no toma argumentos"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Se supone que no vamos a eliminar cosas, no se pudo iniciar «AutoRemover»"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1147,15 +1140,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "La siguiente información puede ayudar a resolver la situación:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error interno, «AutoRemover» rompió cosas"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1168,7 +1161,7 @@ msgstr[1] ""
 "Los paquetes indicados a continuación se instalaron de forma automática y ya "
 "no son necesarios."
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1177,19 +1170,19 @@ msgstr[0] "Se instaló de forma automática %lu paquete y ya no es necesario.\n"
 msgstr[1] ""
 "Se instalaron de forma automática %lu paquetes y ya no son necesarios.\n"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Utilice «apt-get autoremove» para eliminarlos."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Error Interno, AllUpgrade rompió cosas"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Tal vez quiera ejecutar «apt-get -f install» para corregirlo:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1197,7 +1190,7 @@ msgstr ""
 "Dependencias incumplidas. Intente «apt-get -f install» sin paquetes (o "
 "especifique una solución)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1209,74 +1202,74 @@ msgstr ""
 "inestable, que algunos paquetes necesarios no han sido creados o han\n"
 "sido movidos fuera de Incoming."
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Paquetes rotos"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Se instalarán los siguientes paquetes extras:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Paquetes sugeridos:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Paquetes recomendados:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "No se pudo encontrar el paquete %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "fijado %s como instalado automáticamente.\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Calculando la actualización... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Falló"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Listo"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Error interno, el sistema de solución de problemas rompió algunas cosas"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "No se puede bloquear el directorio de descarga"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 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:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, 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:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1286,7 +1279,7 @@ msgstr ""
 "versiones «%s» en:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1298,87 +1291,87 @@ msgstr ""
 "para obtener las últimas actualizaciones (posiblemente no publicadas aún) "
 "del paquete.\n"
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Omitiendo el fichero ya descargado «%s»\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Necesito descargar %sB de archivos fuente.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fuente obtenida %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "No se pudieron obtener algunos archivos."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Falló la orden de desempaquetamiento «%s».\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, 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:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Falló la orden de construcción «%s».\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Falló el proceso hijo"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 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:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, 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:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no tiene dependencias de construcción.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1387,7 +1380,7 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
 "el paquete %s"
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1396,14 +1389,14 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
 "el paquete %s"
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1412,7 +1405,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:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1421,30 +1414,30 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
 "el paquete %s"
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, 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:2996
+#: cmdline/apt-get.cc:3031
 #, 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:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "No se pudieron procesar las dependencias de construcción"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Conectando a %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Módulos soportados:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1535,7 +1528,7 @@ msgstr ""
 "para más información y opciones.\n"
 "                       Este APT tiene poderes de Super Vaca.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1547,33 +1540,33 @@ msgstr ""
 "      Tenga también en cuenta que se han desactivado los bloqueos,\n"
 "      ¡no dependa de la relevancia a la situación real actual!"
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Obj "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Des:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ign "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Err "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Descargados %sB en %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Trabajando]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1584,46 +1577,62 @@ msgstr ""
 " «%s»\n"
 "en la unidad «%s» y pulse Intro\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "pero no está instalado"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "fijado %s como instalado manualmente.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "fijado %s como instalado automáticamente.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s ya está en su versión más reciente.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s ya está en su versión más reciente.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "fijado %s como instalado manualmente.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "No se pudo abrir %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1645,11 +1654,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "¡Registro de paquete desconocido!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1714,198 +1723,200 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Fusionando información disponible"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "No pude crear las tuberías"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "No pude ejecutar gzip"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Archivo dañado"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 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:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Cabecera del TAR tipo %u desconocida, miembro %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Firma del archivo inválida"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Error leyendo la cabecera de miembro del archivo"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "Cabecera de miembro del archivo inválida %s"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Cabecera de miembro del archivo inválida"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "El archivo es muy pequeño"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "No pude leer las cabeceras del archivo"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "DropNode llamado en un nodo todavía ligado"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "¡No pude localizar el elemento enlazado!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "No pude asignar una desviación"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Error interno en AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Tratando de sobreescribir una desviación, %s -> %s y %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Doble suma de desviación %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Archivo de configuración duplicado %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Falló la escritura del archivo %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "No pude cerrar el archivo %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "La trayectoria %s es demasiado larga"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Desempaquetando %s más de una vez"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "El directorio %s está desviado"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "La trayectoria de desviación es demasiado larga"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "No pude localizar el nodo en su bote de enlace"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "La trayectoria es muy larga"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, 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:429
+#: apt-inst/extract.cc:432
 #, 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"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "No pude leer %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "No pude leer %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "No pude borrar %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "No pude crear %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "No pude leer %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "Los directorios info y temp deben de estar en el mismo sistema de archivos"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Leyendo lista de paquetes"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "No pude cambiarme al directorio de administración %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Error interno obteniendo un Nombre de Paquete"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Leyendo Listado de Archivos"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1916,113 +1927,114 @@ msgstr ""
 "archivo entonces cree uno vacío e inmediatamente reinstale la misma versión "
 "del paquete!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "No pude leer el archivo de lista %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Error interno obteniendo un nodo"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "No pude abrir el archivo de desviación %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "El archive de desviaciones está dañado"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Linea inválida en el archivo de desviación: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Error interno agregando una desviación"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "El caché del paquete debe de inicializarse primero"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "No pude encontrar un paquete: Cabecera, desplazo %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Mala sección del ConfFile en el archivo de estado. Desplazo %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Error leyendo Md5. Desplazo %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Este no es un archivo DEB válido, falta el miembro «%s»"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 "Este no es un archivo DEB válido, falta el miembro «%s», «%s» o «%s»"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "No pude cambiar a %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Error interno, no pude localizar el miembro %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "No pude localizar un archivo de control válido"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Archivo de control inanalizable"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "No pude abrir una tubería para %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Error de lectura de %s procesos"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "No pude leer"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "No pude poner el tiempo de modificación"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "No pude leer la base de datos %s del cdrom"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -2030,56 +2042,56 @@ msgstr ""
 "Por favor, utilice «apt-cdrom» para hacer que APT reconozca este CD. No "
 "puede utilizar «apt-get update» para añadir nuevos CDs"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "CD equivocado"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "No pude desmontar el CD-ROM de %s, tal vez todavía este en uso."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Disco no encontrado."
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Fichero no encontrado"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI inválido, los URIS locales no deben de empezar con //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Entrando"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "No pude determinar el nombre del par"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Imposible determinar el nombre local"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "El servidor rechazó nuestra conexión y dijo: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Usuario (USER) falló, el servidor dijo: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Clave (PASS) falló, el servidor dijo: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2087,199 +2099,199 @@ msgstr ""
 "Se especificó un servidor proxy pero no un script de entrada, «Acquire::ftp::"
 "ProxyLogin» está vacío."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Falló la orden «%s» del script de entrada, el servidor dijo: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Tipo (TYPE) falló, el servidor dijo: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "La conexión expiró"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "El servidor cerró la conexión"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Error de lectura"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "No pude crear un socket."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Fallo del protocolo"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Error de escritura"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "No pude crear un socket"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "No pude conectar el socket de datos, expiró el tiempo de conexión"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "No pude conectar un socket pasivo."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo no pude obtener un socket oyente"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "No pude ligar un socket"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "No pude escuchar en el socket"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "No pude determinar el nombre del socket"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "No pude mandar la orden PORT"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Dirección de familia %u desconocida (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT falló, el servidor dijo: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Expiró conexión a socket de datos"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "No pude aceptar la conexión"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Se produjo un problema al hacer un hash del archivo"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Imposible traer archivo, el servidor dijo «%s»"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Expiró el socket de datos"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Falló transferencia de datos, el servidor dijo «%s»"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Consulta"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "No pude invocar "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Conectando a %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, 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:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "No se pudo resolver «%s»"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Fallo temporal al resolver «%s»"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Algo raro pasó al resolver «%s:%s» (%i - %s)"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "No se pudo conectar a %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Se encontró al menos una firma inválida."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Error desconocido ejecutando gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Las siguientes firms fueron inválidas:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2287,106 +2299,111 @@ msgstr ""
 "Las firmas siguientes no se pudieron verificar porque su llave pública no "
 "está disponible:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Esperando las cabeceras"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Obtuve una sola línea de cabecera arriba de %u caracteres"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Mala línea de cabecera"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "El servidor de http envió una cabecera de respuesta inválida"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "El servidor de http envió una cabecera de Content-Length inválida"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "El servidor de http envió una cabecera de Content-Range inválida"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Éste servidor de http tiene el soporte de alcance roto"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Formato de fecha desconocido"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Falló la selección"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Expiró la conexión"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Error escribiendo al archivo de salida"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Error escribiendo a archivo"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Error escribiendo al archivo"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error leyendo del servidor, el lado remoto cerró la conexión."
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Error leyendo del servidor"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Falló al truncar el archivo"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Mala cabecera Data"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Fallo la conexión"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Error interno"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "No puedo hacer mmap de un fichero vacío"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "No pude duplicar el descriptor de fichero %i"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "No pude hacer mmap de %lu bytes"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "No se pudo cerrar «mmap»"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "No pude sincronizar «mmap»"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "No pude hacer mmap de %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Falló al truncar el archivo"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2395,7 +2412,7 @@ msgstr ""
 "La asignación dinámica MMap no tiene más espacio. Por favor, incrementa el "
 "valor de «APT::Cache-Limit». El valor actual es: %lu (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2404,7 +2421,7 @@ msgstr ""
 "No se pudo incrementar el tamaño del MMap dado que se ha alcanzado ya el "
 "límite de %lu bytes."
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2435,97 +2452,97 @@ msgstr "%limin. %liseg."
 msgid "%lis"
 msgstr "%liseg."
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selección %s no encontrada"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Tipo de abreviación no reconocida: «%c»"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Abriendo fichero de configuración %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Error de sintaxis %s:%u: No hay un nombre al comienzo del bloque."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Error de sintaxis %s:%u: Marca mal formada"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Error de sintaxis %s:%u: Basura extra después del valor"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Error de sintaxis %s:%u: Las directivas sólo se pueden poner en el primer "
 "nivel"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Error de sintaxis %s:%u: Demasiadas inclusiones anidadas"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Error de sintaxis %s:%u: Incluido desde aquí"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Error de sintaxis %s:%u: Directiva «%s» no soportada"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Error de sintaxis %s:%u: la directiva «clear» tiene que incluir un árbol de "
 "opciones como argumento"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Error de sintaxis %s:%u: Basura extra al final del archivo"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... ¡Error!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Hecho"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "No se conoce la opción de línea de órdenes «%c» [de %s]."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "No se entiende la opción de línea de órdenes %s"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "La opción de línea de órdenes %s no es un booleano"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "La opción %s necesita un argumento."
@@ -2537,342 +2554,355 @@ msgstr ""
 "Opción %s: La especificación del elemento de configuración debe tener un "
 "=<val>."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "La opción %s exige un argumento entero, no «%s»"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Opción «%s» demasiado larga"
 
-#: 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 "El sentido %s no se entiende, pruebe verdadero o falso."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Operación inválida: %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "No se puede obtener información del punto de montaje %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "No se pudo cambiar a %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "No pude montar el cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "No se pudo abrir el fichero de bloqueo «%s»"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "No se pudo bloquear %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperaba %s pero no estaba allí"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, 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:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "El subproceso %s recibió la señal %u."
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, 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:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "El subproceso %s terminó de forma inesperada"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "No pude abrir el fichero %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "No se pudo abrir el descriptor de fichero %d"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "No se pudo crear el subproceso IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "No se pudo ejecutar el compresor "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, 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:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, 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:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Se produjo un problema al cerrar el fichero gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Se produjo un problema al cerrar el fichero %s"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, 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:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Se produjo un problema al desligar el fichero %s"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Se produjo un problema al sincronizar el fichero"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Caché de paquetes vacía."
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "El archivo de caché de paquetes está dañado"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "El archivo de caché de paquetes es una versión incompatible"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "El archivo de caché de paquetes está dañado"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Esta versión de APT no soporta el sistema de versiones «%s»"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 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:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "PreDepende"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Sugiere"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Recomienda"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Entra en conflicto"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Reemplaza"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Hace obsoleto"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Rompe"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "Mejora"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "requiere"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "estándar"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Creando árbol de dependencias"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Versiones candidatas"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Generación de dependencias"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Leyendo la información de estado"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "No se pudo abrir el fichero de estado %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Falló la escritura del fichero de estado temporal %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "No se pudo tratar el archivo de paquetes %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "No se pudo tratar el archivo de paquetes %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 "Línea %lu mal formada en la lista de fuentes %s ([opción] no parseable)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 "Línea %lu mal formada en la lista de fuentes %s ([opción] demasiado corta)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 "Línea %lu mal formada en la lista de fuentes %s ([%s] no es una asignación)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 "Línea %lu mal formada en la lista de fuentes %s (no hay clave para [%s])"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 "Línea %lu mal formada en la lista de fuentes %s ([%s] la clave %s no tiene "
 "asociado un valor)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Línea %lu mal formada en la lista de fuentes %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Línea %lu mal formada en la lista de fuentes %s (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Línea %lu mal formada en la lista de fuentes %s (dist absoluta)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de dist)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 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:281
+#: apt-pkg/sourcelist.cc:285
 #, 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:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2882,7 +2912,12 @@ msgstr ""
 "de manual con «man 5 apt.conf» bajo «APT::Immediate-Configure» para más "
 "información. (%d)"
 
-#: apt-pkg/packagemanager.cc:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "No pude abrir el fichero «%s»"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2894,22 +2929,12 @@ msgstr ""
 "generalmente es malo, pero si realmente quiere hacerlo, active la opción |"
 "APT::Force-LoopBreak»."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"No se pudo realizar la configuración inmediata sobre el paquete ya "
-"desempaquetado «%s». Consulte la página de manual con «man 5 apt.conf» bajo "
-"«APT::Immediate-Configure» para más información."
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "No se da soporte para el tipo de archivo de índice «%s»"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2917,7 +2942,7 @@ msgstr ""
 "El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para "
 "éste."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2925,12 +2950,12 @@ msgstr ""
 "Error, pkgProblemResolver::Resolve generó cortes, esto puede haber sido "
 "causado por paquetes retenidos."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 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:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2939,241 +2964,203 @@ 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:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Falta el directorio de listas %spartial."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Falta el directorio de archivos %spartial."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "No se pudo bloquear el directorio %s"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Descargando fichero %li de %li (falta %s)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Descargando fichero %li de %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "No se pudo encontrar el método %s."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "El método %s no se inició correctamente"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: 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:163
+#: 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"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "No se pudo leer %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Debe poner algunos URIs fuente («source») en su sources.list"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "No se pudieron analizar o abrir las listas de paquetes o el archivo de "
 "estado."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Tal vez quiera ejecutar «apt-get update» para corregir estos problemas"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "No se pudieron leer las listas de fuentes."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "Registro inválido en el archivo de preferencias %s, no hay cabecera «Package»"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "No se entiende el pin tipo %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "No hay prioridad especificada para pin (o es cero)"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "La caché tiene una versión incompatible de sistema de versiones"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Se produjo un error mientras se procesaba %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Se produjo un error mientras se procesaba %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Se produjo un error mientras se procesaba %s (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Se produjo un error mientras se procesaba %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Se produjo un error mientras se procesaba %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Se produjo un error mientras se procesaba %s (NewVersion%d)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Se produjo un error mientras se procesaba %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Se produjo un error mientras se procesaba %s (NewFileDesc2)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Se produjo un error mientras se procesaba %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Vaya, excedió el número de nombres de paquetes que este APT es capaz de "
 "manejar."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Vaya, excedió el número de versiones que este APT es capaz de manejar."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Vaya, excedió el número de descripciones que este APT es capaz de manejar."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 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:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Se produjo un error mientras se procesaba %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Se produjo un error mientras se procesaba %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, 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:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Recogiendo archivos que proveen"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "Error de E/S guardando caché fuente"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "falló el cambio de nombre, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "La suma MD5 difiere"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "La suma hash difiere"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, 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:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3184,12 +3171,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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Error de GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3199,7 +3186,7 @@ msgstr ""
 "que necesita arreglar manualmente este paquete (debido a que falta una "
 "arquitectura)"
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3208,7 +3195,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:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3216,41 +3203,41 @@ 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:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "El tamaño difiere"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "No se pudo leer el archivo «Release» %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "No se encontraron secciones en el archivo «Release» %s"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, 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:110
+#: apt-pkg/indexrecords.cc:118
 #, 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:125
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Entrada «Date» inválida en el archivo «Release» %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Bloque de fabricante %s sin huella digital"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3259,41 +3246,41 @@ msgstr ""
 "Usando el punto de montaje del CD-ROM %s\n"
 "Montando el CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Identificando.. "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Etiqueta guardada: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "Desmontando el CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Usando el punto de montaje del CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Desmontando el CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Esperando el disco...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Montando el CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Buscando en el disco archivos de índices...\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3302,7 +3289,7 @@ msgstr ""
 "Se encontraron %zu índices de paquetes, %zu índices de fuentes, %zu índices "
 "de traducción y %zu firmas\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3310,16 +3297,16 @@ msgstr ""
 "No pude localizar ningún archivo de paquete, ¿quizás este no sea un disco de "
 "Debian o sea de otra arquitectura?"
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Se encontró la etiqueta: «%s»\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Ese no es un nombre válido, inténtelo de nuevo.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3328,93 +3315,93 @@ msgstr ""
 "Este disco se llama: \n"
 "«%s»\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Copiando las listas de paquetes..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Escribiendo nueva lista de fuente\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 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:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i registros escritos.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, 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:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "%i registros escritos con %i fichero de menos y %i ficheros mal emparejados\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Omitiendo el fichero inexistente %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "No se pudo encontrar un registro de autenticación para: %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "La suma hash difiere para: %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "No se instaló ningún anillo de claves %s."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "No se encontró la Distribución «%s» para «%s»"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "No se encontró la versión «%s» para «%s»"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "No se pudo encontrar la tarea «%s»"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "No se pueden seleccionar distintas versiones del paquete «%s» porque es "
 "puramente virtual"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3423,130 +3410,154 @@ msgstr ""
 "No se puede seleccionar una versión instalada o candidata para el paquete "
 "«%s» dado que éste no tiene ninguna de éstas"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "No se puede seleccionar la última versión del paquete «%s» dado que es "
 "puramente virtual"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "No se puede seleccionar una versión candidata del paquete %s dado que no "
 "tiene candidatos"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "No se puede seleccionar una versión instalada del paquete «%s» puesto que no "
 "está instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Eliminando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "Borrando completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Se detectó la desaparición de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta el directorio «%s»."
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "No pude abrir el fichero «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempaquetando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparándose para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparándose para eliminar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "%s eliminado"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparándose para eliminar completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "Se borró completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "Ejecutando dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas de dependencias - dejando sin instalar"
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3554,7 +3565,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:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3562,7 +3573,7 @@ msgstr ""
 "No se escribió un informe «apport» porque el mensaje de error indica que el "
 "error es de disco lleno"
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3570,14 +3581,14 @@ msgstr ""
 "No se escribió un informe «apport» porque el mensaje de error indica un "
 "error de memoria excedida"
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "No se escribió un informe «apport» porque el mensaje de error indica un "
 "error de E/S de dpkg"
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3586,14 +3597,14 @@ msgstr ""
 "No se pudo bloquear el directorio de administración (%s), ¿quizás haya algún "
 "otro proceso utilizándolo?"
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "No se encontró un archivo de réplica «%s»"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3601,30 +3612,30 @@ msgstr ""
 "se interrumpió la ejecución de dpkg, debe ejecutar manualmente «%s» para "
 "corregir el problema"
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "No bloqueado"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "No se encontró un archivo de réplica «%s»"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "No se encontró un archivo de réplica «%s»"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Réplica: %s]"
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3633,7 +3644,7 @@ msgstr ""
 "No se pudo parchear %s con mmap y con el modo de uso de la operación de "
 "ficheros - el paquete parece dañado."
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3642,10 +3653,69 @@ msgstr ""
 "No se pudo parchear %s con mmap (pero no hay un fallo mmap específico) - el "
 "parche parece dañado."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "La conexión se cerró prematuramente"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Nota: Dpkg realiza esto de forma automática y a propósito."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Predominio mal formado %s línea %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Predominio mal formado %s línea %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Predominio mal formado %s línea %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "decompresor"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "leídos, todavía debía leer %lu pero no queda nada"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "escritos, todavía tenía que escribir %lu pero no pude hacerlo"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "No se pudo realizar la configuración inmediata sobre el paquete ya "
+#~ "desempaquetado «%s». Consulte la página de manual con «man 5 apt.conf» "
+#~ "bajo «APT::Immediate-Configure» para más información."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Error interno, no pude localizar el miembro"
 
diff --git a/po/eu.po b/po/eu.po
index 939a0b062..579b38f8a 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_eu\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -18,153 +18,154 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "%s paketeak (%s bertsioa) mendekotasun arazo bat du:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Pakete Izenak Guztira : "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Pakete Izenak Guztira : "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Pakete normalak:"
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Pakete birtual puruak:"
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Bakanako pakete birtualak: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Nahastutako pakete birtualak: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Falta direnak: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Bertsio Ezberdinak Guztira: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Azalpen Ezberdinak Guztira: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Dependentziak Guztira: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Guztira Bertsio/fitxategi erlazioak: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Fitx/Azalpen erlazioak guztira: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Guztira Saltzaile Mapatzea: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Guztira bateratutako kateak: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Guztira bertsio dependentzia lekua: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Guztira galdutako tokia:"
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Guztira erregistratutako lekua: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "%s pakete fitxategia ez dago sinkronizatuta."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Ez da paketerik aurkitu"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Zehazki eredu bat eman behar duzu."
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ezin da %s paketea lokalizatu"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Pakete Fitxategiak:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Pin duten Paketeak:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(ez da aurkitu)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Instalatuta: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Hautagaia: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(bat ere ez)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Paketearen pin-a:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Bertsio taula:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -236,30 +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:77
+#: cmdline/apt-cdrom.cc:79
 #, 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:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Mesedez sar diska bat gailuan eta enter sakatu"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Huts egin du %s izenaren ordez %s ipintzean"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Prozesu hau bildumako beste CD guztiekin errepikatu."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Parekatu gabeko argumentuak"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -287,12 +288,12 @@ msgstr ""
 "  -c=? Irakurri konfigurazio fitxategi hau\n"
 "  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s ez da baliozko DEB pakete bat."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -316,40 +317,40 @@ msgstr ""
 "  -c=? Irakurri konfigurazio fitxategi hau\n"
 "  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "%s : ezin da idatzi"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Ezin da debconf bertsioa eskuratu. Debconf instalatuta dago?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Pakete luzapenen zerrenda luzeegia da"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Errorea direktorioa prozesatzean %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Iturburu luzapenen zerrenda luzeegia da"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Errorea eduki fitxategiaren goiburua idaztean"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Errorea edukiak prozesatzean %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -428,26 +429,26 @@ msgstr ""
 "  -c=?  Irakurri konfigurazio fitxategi hau\n"
 "  -o=?  Ezarri konfigurazio aukera arbitrario bat"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Ez dago bat datorren hautapenik"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Fitxategi batzuk falta dira `%s' pakete fitxategien taldean"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "Datu-basea hondatuta dago; fitxategiari %s.old izena jarri zaio"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 #, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
@@ -456,111 +457,111 @@ msgstr ""
 "DB formatu baliogabe da. Apt bertsio zaharrago batetik eguneratu baduzu, "
 "mesedez datubasea ezabatu eta birsortu."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Ezin da ireki %s datu-base fitxategia: %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Huts egin du %s(e)tik datuak lortzean"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Artxiboak ez du kontrol erregistrorik"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Ezin da kurtsorerik eskuratu"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A: Ezin da %s direktorioa irakurri\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "A: Ezin da %s atzitu\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "A: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: Erroreak fitxategiari dagozkio "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Huts egin du %s ebaztean"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Huts egin dute zuhaitz-urratsek"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Huts egin du %s irekitzean"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Huts egin du %s esteka irakurtzean"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Huts egin du %s desestekatzean"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Ezin izan da %s %s(r)ekin estekatu"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink-en mugara (%sB) heldu da.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Artxiboak ez du pakete eremurik"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s: ez du override sarrerarik\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s mantentzailea %s da, eta ez %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s: ez du jatorri gainidazketa sarrerarik\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s: ez du bitar gainidazketa sarrerarik\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Huts egin du memoria esleitzean"
 
@@ -570,18 +571,18 @@ msgid "Unable to open %s"
 msgstr "Ezin da %s ireki"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Gaizki osatutako override %s, lerroa: %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Gaizki osatutako override %s, lerroa: %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Gaizki osatutako override %s, lerroa: %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -589,63 +590,51 @@ msgstr "Gaizki osatutako override %s, lerroa: %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "Huts egin du %s override fitxategia irakurtzean"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "'%s' Konpresio Algoritmo Ezezaguna"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "%s irteera konprimituak konpresio-tresna bat behar du"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Huts egin du azpiprozesuarentzako IPC kanalizazio bat sortzean"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Huts egin du FILE* sortzean"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Huts egin du sardetzean"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Konprimatu Umeak"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Barne Errorea, Huts %s sortzerakoan"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Huts egin du IPC azpiprozesua sortzean"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Huts egin du konpresorea exekutatzean "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "deskonpresorea"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "Huts egin du azpiprozesu/fitxategiko S/Iak"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Huts egin du MD5 konputatzean"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Arazoa %s desestekatzean"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Huts egin du %s izenaren ordez %s ipintzean"
@@ -654,75 +643,79 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Adierazpen erregularren konpilazio errorea - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "baina %s instalatuta dago"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "baina %s instalatzeko dago"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "baina ez da instalagarria"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "baina pakete birtuala da"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "baina ez dago instalatuta"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "baina ez da instalatuko"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " edo"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Ondorengo paketeak KENDUKO dira:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Ondorengo paketeak mantendu egin dira:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Ondorengo paketeak bertsio-berrituko dira:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Ondorengo pakete atxikiak aldatu egingo dira:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (arrazoia: %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -730,60 +723,60 @@ msgstr ""
 "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n"
 "EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu berrinstalatuta, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu aurreko bertsiora itzulita, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ez erabat instalatuta edo kenduta.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "%s pakete birtual bat da, honek hornitua:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Instalatuta]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 #, fuzzy
 msgid " [Not candidate version]"
 msgstr "Hautagaien bertsioak"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Zehazki bat hautatu behar duzu instalatzeko."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -794,126 +787,126 @@ msgstr ""
 "egiten dio. Beharbada paketea faltako da, edo zaharkituta egongo da, edo \n"
 "beste iturburu batean bakarrik egongo da erabilgarri\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Baina ondorengo paketeek ordezten dute:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "%s paketeak ez du instalatzeko hautagairik"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s bertsiorik berriena da jada.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s eskuz instalatua bezala ezarri.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Mendekotasunak zuzentzen..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " : huts egin du."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Ezin dira mendekotasunak zuzendu"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Ezin da bertsio berritzeko multzoa minimizatu"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Eginda"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu zuzentzeko."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Egiaztapen abisua gainidazten.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Paketeak egiaztapen gabe instalatu [b/E]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Zenbait pakete ezin dira egiaztatu"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Arazoak daude, eta -y erabili da --force-yes gabe"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Barne errorea, ez da ordenatzeaz amaitu"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Hau bitxia.. Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra "
@@ -921,52 +914,52 @@ 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Artxiboetako %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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Ekintza honen ondoren, %sB gehiago erabiliko dira diskoan.\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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n"
 
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Ezin da %s(e)n duzun leku librea atzeman."
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Ez daukazu nahikoa leku libre %s(e)n."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Bai, egin esandakoa!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -977,28 +970,28 @@ msgstr ""
 "Jarraitzeko, idatzi '%s' esaldia\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Abortatu."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Aurrera jarraitu nahi al duzu [B/e]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ezin da lortu %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Fitxategi batzuk ezin izan dira deskargatu"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Deskarga amaituta eta deskarga soileko moduan"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1006,19 +999,19 @@ msgstr ""
 "Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo "
 "--fix-missing aukerarekin saiatu?"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing eta euskarri aldaketa ez dira onartzen oraingoz"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Falta diren paketeak ezin dira zuzendu."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Abortatu instalazioa."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1028,35 +1021,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Suposatu ez dugun zerbait ezabatuko da, ezin da AutoRemover abiarazi"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1074,15 +1067,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "Informazio honek arazoa konpontzen lagun dezake:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1096,7 +1089,7 @@ msgstr[1] ""
 "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
 "behar."
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1108,19 +1101,19 @@ msgstr[1] ""
 "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
 "behar."
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "'apt-get autoremove' erabili ezabatzeko."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1128,7 +1121,7 @@ msgstr ""
 "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
 "zehaztu konponbide bat)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1140,80 +1133,80 @@ msgstr ""
 "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
 "Sarrerakoetan (Incoming) egoten jarraituko dute."
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Hautsitako paketeak"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Iradokitako paketeak:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Gomendatutako paketeak:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Ezin izan da %s paketea aurkitu"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s eskuz instalatua bezala ezarri.\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Berriketak kalkulatzen... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Huts egin du"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Eginda"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Ezin da deskarga direktorioa blokeatu"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
 
-#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1221,87 +1214,87 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Eskuratu %s iturburua\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Huts egin du zenbat artxibo lortzean."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
 
-#: cmdline/apt-get.cc:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Prozesu umeak huts egin du"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 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:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, 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:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s: ez du eraikitze mendekotasunik.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1309,7 +1302,7 @@ msgid ""
 msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1317,14 +1310,14 @@ msgid ""
 msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1333,7 +1326,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:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1341,30 +1334,30 @@ msgid ""
 msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, 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:2996
+#: cmdline/apt-get.cc:3031
 #, 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:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Konektatzen -> %s.(%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Onartutako Moduluak:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1451,7 +1444,7 @@ msgstr ""
 "sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n"
 "                       APT honek Super Behiaren Ahalmenak ditu.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1459,33 +1452,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Atzituta "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Hartu:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ez ikusi "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Err "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Lortuta: %sB (%s) (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Lanean]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1496,46 +1489,62 @@ msgstr ""
 " '%s'\n"
 "izeneko diska '%s' gailuan eta enter sakatu\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "baina ez dago instalatuta"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s eskuz instalatua bezala ezarri.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s eskuz instalatua bezala ezarri.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s bertsiorik berriena da jada.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s bertsiorik berriena da jada.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s eskuz instalatua bezala ezarri.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Huts egin du %s irekitzean"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1557,11 +1566,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Pakete erregistro ezezaguna!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1623,196 +1632,198 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Eskuragarrien datuak biltzen"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Huts egin du kanalizazioak sortzean"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Huts egin du gzip exekutatzean "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Hondatutako artxiboa"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "%u TAR goiburu mota ezezaguna, %s kidea"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Artxibo sinadura baliogabea"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Errorea artxiboko kidearen goiburua irakurtzean"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, fuzzy, c-format
 msgid "Invalid archive member header %s"
 msgstr "Artxiboko kidearen goiburua baliogabea da"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Artxiboko kidearen goiburua baliogabea da"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Artxiboa laburregia da"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Huts egin artxibo goiburuak irakurtzean"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "DropNode-ri dei egin zaio oraindik estekatutako nodoan"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Huts egin du hash-elementua lokalizatzean!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Huts egin du desbideratzea lokalizatzean"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "AddDiversion-n barne errorea"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Desbideratze bat gainidazten saiatzen: %s -> %s eta %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Desbideratzearen gehitze bikoitza: %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Konfigurazio fitxategi bikoiztua: %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Ezin izan da %s fitxategian idatzi"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Ezin izan da %s fitxategia itxi"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "%s bidea luzeegia da"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s behin baino gehiagotan deskonprimitzen"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "%s direktorioa desbideratuta dago"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Desbideratzearen bidea luzeegia da"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "Huts egin du nodoa bere hash-ontzian lokalizatzean"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Bidea luzeegia da"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Gainidatzi pakete-konkordantzia %s(r)en bertsiorik gabe"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "%s/%s fitxategiak %s paketekoa gainidazten du"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ezin da %s irakurri"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Ezin da daturik lortu %s(e)tik"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Huts egin du %s kentzean"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Ezin da %s sortu"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Huts egin du %sinfo-tik datuak lortzean"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "info eta temp direktorioek fitxategi sistema berean egon behar dute"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Pakete Zerrenda irakurtzen"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Huts egin du %sinfo administrazio direktoriora aldatzean"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Barne errorea pakete Izen bat eskuratzerakoan"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Fitxategi zerrendaketa irakurtzen"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1823,114 +1834,115 @@ msgstr ""
 "baduzu leheneratu, hustu ezazu, eta berrinstalatu berehala paketearen "
 "bertsio bera!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Huts egin du %sinfo/%s zerrenda fitxategia irakurtzean"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Barne errorea nodo bat eskuratzerakoan"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Huts egin du desbideratzeen %sdiversions fitxategia irekitzean"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "Desbideratze fitxategia hondatuta dago"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Lerro baliogabea desbideratze fitxategian: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Barne errorea desbideratze bat gehitzean"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "Paketearen katxea hasieratu behar da lehendabizi"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Ezin izan da pakete bat aurkitu: Burua, mugitu %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Okerreko ConfFile sekzioa egoera fitxategian. Desplazamendua %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Errorea MD5 analizatzean. Desplazamendua %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Ez da baliozko DEB artxiboa; '%s' kidea falta da"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 "Hau ez da baliozko DEB fitxategi bat, ez du  '%s', '%s' edo '%s' atalik "
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Ezin izan da %s(e)ra aldatu"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Barne Errorea, ezin da %s atala kokatu"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Ezin izan da baliozko kontrol fitxategi bat lokalizatu"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Kontrol fitxategi ezin analizagarria"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Irakurri errorea %s prozesutik"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Huts egin du atzitzean"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Huts egin du aldaketa ordua ezartzean"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Ezin da cdrom-eko %s datu-basea irakurri"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1938,57 +1950,57 @@ msgstr ""
 "Mesedez erabili apt-cdrom APT-k CD hau ezagutu dezan.\n"
 "apt-get update ezin da erabili CD berriak gehitzeko"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "CD okerra"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 "Ezin izan da %s(e)ko CD-ROMa desmuntatu; beharbada erabiltzen ariko da."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Ez da diska aurkitu"
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Ez da fitxategia aurkitu"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI baliogabea. URI lokalek ezin dute // eduki hasieran"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Sartzen"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Ezin izan da peer edo parekoaren izena zehaztu"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Ezin izan da izen lokala zehaztu"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Zerbitzariak gure konexioa ukatu eta hau esan du: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USERek huts egin du, eta zerbitzariak hau esan du: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASSek huts egin du, eta zerbitzariak hau esan du: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -1996,201 +2008,201 @@ msgstr ""
 "Proxy zerbitzari bat zehaztu da, baina sarrerako script-ik ez. Acquire::ftp::"
 "ProxyLogin hutsik dago."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 "Sarrerako script-eko '%s' komandoak huts egin du, eta zerbitzariak hau esan "
 "du: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPEk huts egin du, eta zerbitzariak hau esan du: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Konexioa denboraz kanpo"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Zerbitzariak konexioa itxi du"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Irakurketa errorea"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Erantzun batek bufferrari gainez eragin dio."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Protokolo hondatzea"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Idazketa errorea"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Ezin izan da socket-a sortu"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Ezin izan da datu-socketa konektatu; konexioak denbora muga gainditu du"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Ezin izan da socket pasibora konektatu."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo-k ezin izan du socket entzule bat eskuratu"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Ezin izan da socket bat lotu"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Ezin izan da socket-ean entzun"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Ezin izan da socket-aren izena zehaztu"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Ezin da PORT komandoa bidali"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Helbide familia ezezagunaa: %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRTek huts egin du, eta zerbitzariak hau esan du: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Datu-socket konexioak denbora muga gainditu du"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Ezin da konexioa onartu"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Arazoa fitxategiaren hash egitean"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Ezin da fitxategia lortu; zerbitzariak hau esan du: '%s'"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Datu-socketak denbora muga gainditu du"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Datu transferentziak huts egin du, eta zerbitzariak hau esan du: '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Kontsulta"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Ezin da deitu "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Konektatzen -> %s.(%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Konektatzen -> %s..."
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Ezin izan da '%s' ebatzi"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Aldi baterako akatsa '%s' ebaztean"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Ezin da konektatu -> %s %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Beintza sinadura baliogabe bat aurkitu da."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 #, 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Errore ezezaguna gpgv exekutatzean"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Ondorengo sinadurak baliogabeak dira:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2198,108 +2210,113 @@ msgstr ""
 "Ondorengo sinadurak ezin dira egiaztatu gako publikoa ez bait dago "
 "eskuragarri:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Goiburuen zain"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Okerreko goiburu-lerroa"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "http zerbitzariak erantzun goiburu baliogabe bat bidali du."
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "http zerbitzariak barruti onarpena apurturik du"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Datu formatu ezezaguna"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Hautapenak huts egin du"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Konexioaren denbora muga gainditu da"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Errorea irteerako fitxategian idaztean"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Errorea fitxategian idaztean"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Errorea fitxategian idaztean"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Errorea zerbitzaritik irakurtzean"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Huts fitxategia mozterakoan"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Goiburu data gaizki dago"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Konexioak huts egin du"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Barne errorea"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Ezin da fitxategi huts baten mmap egin"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Ezin izan da %lu byteren mmap egin"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "Ezin da %s ireki"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "Ezin da deitu "
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Ezin izan da %lu byteren mmap egin"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Huts fitxategia mozterakoan"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2308,14 +2325,14 @@ msgstr ""
 "MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Limit muga. Uneko "
 "balioa: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2344,93 +2361,93 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "%s hautapena ez da aurkitu"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Mota ezezaguneko laburtzapena: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "%s konfigurazio fitxategia irekitzen"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Sintaxi errorea, %s:%u: Blokearen hasieran ez dago izenik."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Sintaxi errorea %s:%u: Gaizki eratutako"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria balioaren ondoren"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Sintaxi errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Sintaxi errorea, %s:%u: habiaratutako elementu gehiegi"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Sintaxi errorea, %s:%u: hemendik barne hartuta"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Sintaxi errorea, %s:%u: onartu gabeko '%s' direktiba"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr "Sintaxi errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria fitxategi amaieran"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Errorea!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Eginda"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Ez da ezagutzen komando lerroko '%c' aukera [%s]."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Ez da ulertzen komando lerroko %s aukera"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Komando lerroko %s aukera ez da boolearra."
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "%s aukerak argumentu bat behar du."
@@ -2441,346 +2458,364 @@ msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 "%s aukera: konfigurazio elementuaren zehaztapenak =<val> eduki behar du."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "%s aukerak osoko argumentu bat behar du, eta ez '%s'"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "'%s' aukera luzeegia da"
 
-#: 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 "%s zentzua ez da ulertzen; probatu egiazkoa edo faltsua."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Eragiketa baliogabea: %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Ezin da atzitu %s muntatze puntua"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Ezin da %s(e)ra aldatu"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Huts egin du CDROMa atzitzean"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Ezin izan da %s blokeo fitxategia ireki"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Ezin izan da %s blokeoa hartu"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s espero zen baina ez zegoen han"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, 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:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "%s azpiprozesua ustekabean amaitu da"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s fitxategia ezin izan da ireki"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Huts egin du IPC azpiprozesua sortzean"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Huts egin du konpresorea exekutatzean "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, 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:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, 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:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Arazoa fitxategia ixtean"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Arazoa fitxategia ixtean"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Arazoa fitxategia sinkronizatzean"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Arazoa fitxategia desestekatzean"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Arazoa fitxategia sinkronizatzean"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Paketeen katxea hutsik"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Paketeen katxe fitxategia hondatuta dago"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "Paketeen katxe fixategiaren bertsioa ez da bateragarria"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Paketeen katxe fitxategia hondatuta dago"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT honek ez du '%s' bertsio sistema onartzen"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "Paketeen katxea beste arkitektura batentzat sortuta dago"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Mendekotasuna:"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Aurremendekotasuna:"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Iradokizuna:"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Gomendioa:"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Gatazka:"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Ordeztea:"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Zaharkitzea:"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Apurturik"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "garrantzitsua"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "beharrezkoa"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "estandarra"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "aukerakoa"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "estra"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Dependentzia zuhaitza eraikitzen"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Hautagaien bertsioak"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Dependentzi Sormena"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Egoera argibideak irakurtzen"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Huts egin du %s EgoeraFitxategia irekitzean"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Ezin da %s pakete fitxategia analizatu (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Ezin da %s pakete fitxategia analizatu (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "%s irekitzen"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, 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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "%s fitxategia ezin izan da ireki"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2792,26 +2827,19 @@ msgstr ""
 "izaten da, baina hala ere egin nahi baduzu, aktibatu APT::Force-LoopBreak "
 "aukera."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "'%s' motako indize fitxategirik ez da onartzen"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 "%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2819,11 +2847,11 @@ msgstr ""
 "Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada "
 "atxikitako paketeek eraginda."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu."
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2832,231 +2860,193 @@ msgstr ""
 "Indize fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo "
 "zaharrak erabili dira haien ordez."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "%spartial zerrenda-direktorioa falta da."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "%spartial artxibo direktorioa falta da."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "Ezin da zerrenda direktorioa blokeatu"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "%li fitxategia jasotzen %li-tik"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "%s metodoa ez da behar bezala abiarazi"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: 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:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Ezin da pakete sistemaren mota egokirik zehaztu"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Ezin da %s atzitu."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "'Iturburu' URI batzuk jarri behar dituzu sources.list-en"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Pakete zerrenda edo egoera fitxategia ezin dira analizatu edo ireki."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Beharbada 'apt-get update' exekutatu nahiko duzu arazoak konpontzeko"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Ezin izan da Iturburu zerrenda irakurri."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Erregistro baliogabea hobespenen fitxategian, pakete goibururik ez"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Ez da ulertu %s orratz-mota (pin)"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Katxearen bertsio sistema ez da bateragarria"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Errorea gertatu da %s prozesatzean (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Errorea gertatu da %s prozesatzean (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Errorea gertatu da %s prozesatzean (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Errorea gertatu da %s prozesatzean (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Errorea gertatu da %s prozesatzean (NewVersion1)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Errorea gertatu da %s prozesatzean (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Errorea gertatu da %s prozesatzean (NewFileDesc1)"
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "APT honek maneia dezakeen pakete izenen kopurua gainditu duzu."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "APT honek maneia dezakeen bertsio kopurua gainditu duzu."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "APT honek maneia dezakeen azalpen kopurua gainditu duzu."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 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:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Errorea gertatu da %s prozesatzean (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Fitxategiaren erreferentziak biltzen"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "S/I errorea iturburu katxea gordetzean"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum ez dator bat"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Egiaztapena ez dator bat"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3064,12 +3054,12 @@ msgid ""
 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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3078,7 +3068,7 @@ msgstr ""
 "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
 "beharko duzu paketea. (arkitektura falta delako)"
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3087,7 +3077,7 @@ msgstr ""
 "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
 "beharko duzu paketea."
 
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3095,41 +3085,41 @@ msgstr ""
 "Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
 "paketearentzat."
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Tamaina ez dator bat"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Ezin da %s pakete fitxategia analizatu (1)"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Lerro baliogabea desbideratze fitxategian: %s"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ezin da %s pakete fitxategia analizatu (1)"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "%s saltzaile blokeak ez du egiaztapen markarik"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3138,41 +3128,41 @@ msgstr ""
 "%s CD-ROM muntatze puntua erabiltzen\n"
 "CD-ROM-a muntatzen\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Egiaztatzen... "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Gordetako Etiketa: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "CD-ROM Desmuntatzen...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "%s CD-ROM muntatze puntua erabiltzen\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "CD-ROM-a desmuntatzen\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Diska itxaroten...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "CD-ROM-a muntatzen...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Indize fitxategien bila diska arakatzen...\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3181,22 +3171,22 @@ msgstr ""
 "%zu pakete indize, %zu jatorri indize %zu itzulpen indize eta %zu sinadura "
 "aurkitu dira\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Aurkitutako Etiketa: '%s' \n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Hau ez baliozko izen bat, froga berriro.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3205,296 +3195,369 @@ msgstr ""
 "Diskaren izen:\n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Pakete zerrendak kopiatzen..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Jatorri zerrenda berria idazten\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "Diskoarentzako jatorri sarrerak:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i erregistro grabaturik.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i erregistro eta %i okerreko fitxategi grabaturik\n"
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "%s konfigurazio fitxategia irekitzen"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Egiaztapena ez dator bat"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Abortatu instalazioa."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Ezin izan da %s zeregina aurkitu"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Ezin izan da %s paketea aurkitu"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "%s Instalatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "%s konfiguratzen"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "%s kentzen"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s guztiz ezabatu da"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "'%s' direktorioa falta da"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "%s fitxategia ezin izan da ireki"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "%s prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s irekitzen"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s konfiguratzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "%s Instalatuta"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s kentzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "%s kendurik"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s guztiz ezabatzeko prestatzen"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s guztiz ezabatu da"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Ezin da zerrenda direktorioa blokeatu"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "%s fitxategia ezin izan da ireki"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Konexioa behar baino lehenago itxi da"
 
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Gaizki osatutako override %s, lerroa: %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Gaizki osatutako override %s, lerroa: %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Gaizki osatutako override %s, lerroa: %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "deskonpresorea"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "idatzita; oraindik %lu idazteke, baina ezin da"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (NewVersion1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Barne Errorea, ezin da atala kokatu"
 
diff --git a/po/fi.po b/po/fi.po
index eaab969aa..b334cc5e0 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -18,151 +18,152 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paketin %s versiossa %s on tyydyttämätön riippuvuus:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Pakettien kokonaismäärä : "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Pakettien kokonaismäärä : "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Tavallisia paketteja: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Aitoja näennäispaketteja: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Yksinkertaisia näennäispaketteja: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Sekanäennäispaketteja: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Puuttuu: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Eri versioita yhteensä: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Eri kuvauksia yhteensä: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Riippuvuuksia yhteensä: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Versio/tdsto suhteita yht: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Kuvaus/tdsto suhteita yht: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Tarjoamiskuvauksia yhteensä: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Erilaisia merkkijonoja yhteensä: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Versioriippuvuustila yhteensä: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Löysää tilaa yhteensä: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Käytetty tila yhteensä: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakettitiedosto %s ei ole ajan tasalla."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Yhtään pakettia ei löytynyt"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "On annettava täsmälleen yksi lauseke"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Pakettia %s ei löydy"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Pakettitiedostot:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Paketit joissa tunniste:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(ei löydy)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Asennettu: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Ehdokas: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(ei mitään)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Paketin tunnistenumero: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Versiotaulukko:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -234,29 +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:77
+#: cmdline/apt-cdrom.cc:79
 #, 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:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Aseta levy asemaan ja paina Enter"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Toista tämä lopuille rompuille kasassasi."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Parametrit eivät ole pareittain"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -284,12 +285,12 @@ msgstr ""
 "  -c=? Lue tämä asetustiedosto\n"
 "  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s ei kelpaa DEB-paketiksi."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -313,41 +314,41 @@ msgstr ""
 "  -c=? Lue tämä asetustiedosto\n"
 "  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Ohjelman debconf versiota ei saa selvitettyä. Onko debconf asennettu?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Paketin laajennuslista on liian pitkä"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Tapahtui virhe käsiteltäessa kansiota %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Lähteiden laajennuslista on liian pitkä"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr ""
 "Tapahtui virhe kirjoitettaessa otsikkotietoa sisällysluettelotiedostoon"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Tapahtui virhe käsiteltäessä sisällysluetteloa %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -429,26 +430,26 @@ msgstr ""
 "  -c=?  Lue tämä asetustiedosto\n"
 "  -o=?  Aseta mikä asetusvalitsin tahansa"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Mitkään valinnat eivät täsmänneet"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Pakettitiedostojen ryhmästä \"%s\" puuttuu joitain tiedostoja"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "Tietokanta on turmeltunut, tiedosto nimetty %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "Tietokanta on vanha, yritetään päivittää %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 #, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
@@ -457,111 +458,111 @@ msgstr ""
 "Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, "
 "on tietokanta poistettava ja luotava uudelleen."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Tietokantatiedostoa %s ei saatu avattua: %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Tiedostolle %s ei toimi stat"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Arkistolla ei ole ohjaustietuetta"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Kohdistinta ei saada"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Kansiota %s ei voi lukea\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Tdstolle %s ei toimi stat\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: Tiedostossa virheitä "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Osoitteen %s selvitys ei onnistunut"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Puun läpikäynti ei onnistunut"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Tiedoston %s avaaminen ei onnistunut"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "readlink %s ei onnistunut"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "unlink %s ei onnistunut"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Linkin %s -> %s luonti ei onnistunut"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLinkin yläraja %st saavutettu.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Arkistossa ei ollut pakettikenttää"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s:llä ei ole poikkeustietuetta\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s ylläpitäjä on %s eikä %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s:llä ei ole poikkeustietuetta\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s:llä ei  ole binääristäkään poikkeustietuetta\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Muistin varaaminen ei onnistunut"
 
@@ -571,18 +572,18 @@ msgid "Unable to open %s"
 msgstr "Tiedoston %s avaaminen ei onnistunut"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -590,63 +591,51 @@ msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 3"
 msgid "Failed to read the override file %s"
 msgstr "Poikkeustiedoston %s lukeminen ei onnistunut"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Tuntematon pakkausalgoritmi \"%s\""
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Pakattu tulostus %s tarvitsee pakkausjoukon"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "IPC-putken luominen aliprosessiin ei onnistunut"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "FILE* luominen ei onnistunut"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "fork ei onnistunut"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Compress-lapsiprosessi"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Sisäinen virhe, prosessin %s luominen ei onnistunut"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Prosessien välistä kommunikaatiota aliprosessiin ei saatu luotua"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Pakkaajan käynnistäminen ei onnistunut"
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "purkaja"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "Syöttö/tulostus aliprosessiin/tiedostoon ei onnistunut"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttä"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Ilmeni pulmia poistettaessa tiedosto %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
@@ -655,75 +644,79 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
 msgid "Y"
 msgstr "K"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Käännösvirhe lausekkeessa - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "mutta %s on asennettu"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "mutta %s on merkitty asennettavaksi"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "mutta ei ole asennuskelpoinen"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "mutta on näennäispaketti"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "mutta ei ole asennettu"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "mutta ei ole merkitty asennettavaksi"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " tai"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Seuraavat UUDET paketit asennetaan:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Seuraavat paketit POISTETAAN:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Nämä paketit on jätetty odottamaan:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Nämä paketit päivitetään:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Nämä paketit VARHENNETAAN:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Seuraavat pysytetyt paketit muutetaan:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (syynä %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -731,60 +724,60 @@ msgstr ""
 "VAROITUS: Seuraavat välttämättömät paketit poistetaan.\n"
 "Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu päivitetty, %lu uutta asennusta, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu uudelleen asennettua, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu varhennettua, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Paketti %s on näennäispaketti, jonka kattaa:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Asennettu]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 #, fuzzy
 msgid " [Not candidate version]"
 msgstr "Mahdolliset versiot"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Yksi pitää valita asennettavaksi."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -795,179 +788,179 @@ msgstr ""
 "Tämä voi tarkoittaa paketin puuttuvan, olevan vanhentunut tai\n"
 "saatavilla vain jostain muusta lähteestä\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Seuraavat paketit kuitenkin korvaavat sen:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Paketilla %s ei ole asennettavaa valintaa"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Huomautus, valitaan %s eikä %s\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s on jo uusin versio.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Valittiin versio %s (%s) paketille %s\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Valittiin versio %s (%s) paketille %s\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Korjataan riippuvuuksia..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " ei onnistunut."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Riippuvuuksien korjaus ei onnistu"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Päivitysjoukon minimointi ei onnistu"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Valmis"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Varoitus varmistamisesta on ohitettu.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Asennetaanko nämä paketit ilman todennusta [y/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "No jo on... Koot eivät täsmää, sähköpostita email apt@packages.debian.org"
 
 #. 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Noudettavaa arkistoa %st/%st.\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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Noudettavaa arkistoa %st.\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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Toiminnon jälkeen käytetään %s t lisää levytilaa.\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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n"
 
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "On määritetty Trivial Only mutta tämä ei ole itsestäänselvä toimenpide."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Kyllä, tee kuten käsketään!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -978,28 +971,28 @@ msgstr ""
 "Jatka kirjoittamalla \"%s\"\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Keskeytä."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Haluatko jatkaa [K/e]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Tiedoston %s nouto ei onnistunut  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Joidenkin tiedostojen nouto ei onnistunut"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Nouto on valmis ja määrätty vain nouto"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1007,19 +1000,19 @@ msgstr ""
 "Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\" auttaa tai "
 "kokeile --fix-missing?"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Puuttuvia paketteja ei voi korjata."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Asennus keskeytetään."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1029,36 +1022,36 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "stat ei toiminut lähdepakettiluettelolle %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Komento update ei käytä parametreja"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "On tarkoitus olla poistamatta mitään, joten AutoRemover:ia ei voi käynnistää"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1076,15 +1069,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Sisäinen virhe, AutoRemover rikkoi jotain"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1098,7 +1091,7 @@ msgstr[1] ""
 "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
 "vaadittuja:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1110,19 +1103,19 @@ msgstr[1] ""
 "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
 "vaadittuja:"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Poista ne komennolla \"apt-get autoremove\"."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1130,7 +1123,7 @@ msgstr ""
 "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
 "ilmanpaketteja (tai ratkaise itse)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1141,80 +1134,80 @@ msgstr ""
 "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n"
 "vielä luotu tai siirretty Incoming-kansiosta."
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Rikkinäiset paketit"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Ehdotetut paketit:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Suositellut paketit:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Pakettia %s ei löytynyt"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, 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:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Käsitellään päivitystä ... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Ei onnistunut"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Valmis"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Sisäinen virhe, resolver rikkoi jotain"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Noutokansiota ei saatu lukittua"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 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:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1222,86 +1215,86 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "On noudettava %st lähdekoodiarkistoja.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Nouda lähdekoodi %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Purkukomento \"%s\" ei onnistunut.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
 
-#: cmdline/apt-get.cc:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Lapsiprosessi kaatui"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
 
-#: cmdline/apt-get.cc:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
 
-#: cmdline/apt-get.cc:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1309,7 +1302,7 @@ msgid ""
 msgstr ""
 "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1317,14 +1310,14 @@ msgid ""
 msgstr ""
 "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1333,7 +1326,7 @@ msgstr ""
 "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
 "ei vastaa versioriippuvuuksia"
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1341,30 +1334,30 @@ msgid ""
 msgstr ""
 "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Avataan yhteys %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Tuetut moduulit:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1450,7 +1443,7 @@ msgstr ""
 "lisätietoja ja lisää valitsimia.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1458,33 +1451,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Löytyi "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Nouda:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Siv "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Vrhe "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Noudettiin %st ajassa %s (%st/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Työskennellään]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1495,46 +1488,62 @@ msgstr ""
 "\"%s\"\n"
 "asemaan \"%s\" ja paina Enter\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "mutta ei ole asennettu"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s on jo uusin versio.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s on jo uusin versio.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Tiedoston %s avaaminen ei onnistunut"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1556,11 +1565,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Tuntematon pakettitietue!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1623,196 +1632,198 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Yhdistetään saatavuustiedot"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Putkien luonti ei onnistunut"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "exec gzip ei onnistunut"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Arkisto on turmeltunut"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar-ohjelman laskema tarkistussumma ei täsmää, arkisto on turmeltunut"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Arkiston tarkistussumma on virheellinen"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Tapahtui virhe luettaessa arkiston tiedoston otsikkoa"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, fuzzy, c-format
 msgid "Invalid archive member header %s"
 msgstr "Arkiston tiedoston otsikko on virheellinen"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Arkiston tiedoston otsikko on virheellinen"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Arkisto on pienempi kuin pitäisi"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Arkiston otsikoiden luku ei onnistunut"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "Kutsuttiin DropNode mutta tiedostoon on vielä linkki"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Hajautusalkiota ei löytynyt!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Korvautuksen varaus ei onnistunut"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "AddDiversion: sisäinen virhe"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Yritetään kirjoittaa korvautuksen päälle, %s -> %s ja %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Korvautuksen kaksoislisäys %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Asetustiedoston kaksoiskappale %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Tiedoston %s kirjoittaminen ei onnistunut"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Tiedoston %s sulkeminen ei onnistunut"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Polku %s on liian pitkä"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Purettiin %s useammin kuin kerran"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Kansio %s on korvautunut"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Korvautuspolku on liian pitkä"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "Solmua ei löytynyt sen hajautuslokerosta"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Polku on liian pitkä"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, 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:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Tiedostoa %s ei voi lukea"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Tiedostolle %s ei toimi stat"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Tiedoston %s poistaminen ei onnistunut"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Tiedostoa %s ei voi luoda"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "stat ei toimi: %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Kansioiden info ja temp pitää olla samassa tiedostojärjestelmässä"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Luetaan pakettiluetteloita"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Ylläpitokansioon %sinfo vaihtaminen ei onnistunut"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Tapahtui sisäinen virhe haettaessa paketin nimeä"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Luetaan tiedostoluetteloa"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1823,115 +1834,116 @@ msgstr ""
 "ei voi palauttaa, tyhjennä tiedosto ja asenna välittömästi paketin sama "
 "versio uudelleen!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Tapahtui virhe luettelotiedostoa %sinfo/%s luettaessa"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Tapahtui sisäinen virhe varattaessa tiedostosolmua"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Tapahtui virhe avattaessa korvautustiedostoa %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "Korvautustiedosto on turmeltunut"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Virheellinen rivi korvautustiedostossa: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Tapahtui sisäinen virhe lisättäessä korvautusta"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "Pakettivarasto on ensin alustettava"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Paketin otsikkoa ei löydy, kohta %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Virheellinen ConfFile-lohko tilatiedostossa. Kohta %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Tapahtui virhe jäsennettäessä MD5:ttä. Kohta %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Tämä ei ole kelvollinen DEB-arkisto, puuttuu tiedosto \"%s\""
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 "Tämä ei ole kelvollinen DEB-arkisto, jokin osista \"%s\", \"%s\" tai \"%s\" "
 "puuttuu."
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Kansioon %s vaihto ei onnistunut"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Tapahtui sisäinen virhe, tiedostoa %s ei löydy"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Kelvollista ohjaustiedostoa ei löydy"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Ohjaustiedosto ei jäsenny"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Putkea %s ei voitu avata"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Prosessi %s ilmoitti lukuvirheestä"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Komento stat ei toiminut"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Rompputietokantaa %s ei voi lukea"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1939,56 +1951,56 @@ msgstr ""
 "Käytä komentoa apt-cdrom jotta APT tunnistaa tämän rompun, apt-get update ei "
 "osaa lisätä uusia romppuja"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "Väärä romppu"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Rompun %s irrottaminen ei onnistu, se on ehkä käytössä."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Levyä ei löydy"
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Tiedostoa ei löydy"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI on kelvoton, paikallinen URI ei saa alkaa //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Kirjaudutaan sisään"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Vastapään nimeä ei saa selville"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Paikallista nimeä ei saa selville"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Palvelin ei huolinut yhteyttä ilmoituksella: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER ei onnistunut, palvelimen ilmoitus: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS ei onnistunut, palvelimen ilmoitus: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -1996,199 +2008,199 @@ msgstr ""
 "Määritettiin välipalvelin mutta ei komentotiedostoa kirjautumiseen, Acquire::"
 "ftp::ProxyLogin on tyhjä."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Komentotiedoston rivi \"%s\" ei toiminut, palvelin ilmoitti: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE ei toiminut, palvelin ilmoitti: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Yhteys aikakatkaistiin"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Palvelin sulki yhteyden"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Lukuvirhe"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Vastaus aiheutti puskurin ylivuodon."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Yhteyskäytäntö on turmeltunut"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Virhe kirjoitettaessa"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Pistoketta ei voitu luoda"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "Pistoketta ei voitu kytkeä, yhteys aikakatkaistiin"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Passiivista pistoketta ei voitu kytkeä."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo ei saanut kuuntelupistoketta"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Pistoketta ei voitu nimetä"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Pistoketta ei voitu kuunnella"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Pistokkeen nimeä ei saatu selville"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Komennon PORT lähetys ei onnistu"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Tuntematon osoiteperhe %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT ei onnistunut, palvelin ilmoitti: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Pistokkeen kytkeminen aikakatkaistiin"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Yhteyttä ei voitu hyväksyä"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Pulmia tiedoston hajautuksessa"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Tiedostoa ei saatu noudettua, palvelin ilmoitti \"%s\""
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Pistoke aikakatkaistiin"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Tiedonsiirto ei onnistunut, palvelin ilmoitti \"%s\""
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Kysely"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Käynnistys ei onnistu"
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Avataan yhteys %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Yhteyden %s avaus ei onnistu: %s (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Avataan yhteys %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nimeä \"%s\" ei voitu selvittää"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Tilapäinen häiriö selvitettäessä \"%s\""
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 #, 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2196,122 +2208,127 @@ msgstr ""
 "Seuraavia allekirjoituksia ei voinut varmentaa koska julkista avainta ei ole "
 "saatavilla:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Odotetaan otsikoita"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Virheellinen otsikkorivi"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "HTTP-palvelimen arvoaluetuki on rikki"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Tuntematon päiväysmuoto"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Select ei toiminut"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Yhteys aikakatkaistiin"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Tapahtui virhe luettaessa palvelimelta"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Tiedoston typistäminen ei onnistunut"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Virheellinen otsikkotieto"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Yhteys ei toiminut"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Sisäinen virhe"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Putkea %s ei voitu avata"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Ei voitu tehdä %lu tavun mmap:ia"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "Tiedoston %s avaaminen ei onnistunut"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "Käynnistys ei onnistu"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Ei voitu tehdä %lu tavun mmap:ia"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Tiedoston typistäminen ei onnistunut"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2340,93 +2357,93 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Valintaa %s ei löydy"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Tuntematon tyypin lyhenne: \"%c\""
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Avataan asetustiedosto %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaksivirhe %s: %u: Lohko alkaa ilman nimeä."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntaksivirhe %s: %u: väärän muotoinen nimikenttä"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntaksivirhe %s: %u: Arvon jälkeen ylimääräistä roskaa"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Syntaksivirhe %s: %u: Direktiivejä voi olla vain ylimmällä tasolla"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntaksivirhe %s: %u: Liian monta sisäkkäistä includea"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntaksivirhe %s: %u: Sisällytetty tästä"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaksivirhe %s: %u: Tätä direktiiviä ei tueta \"%s\""
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr "Syntaksivirhe %s: %u: Direktiivejä voi olla vain ylimmällä tasolla"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntaksivirhe %s: %u: Ylimääräistä roskaa tiedoston lopussa"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Virhe!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Valmis"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Komentorivin valitsin \"%c\" [%s] on tuntematon."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Komentorivin valitsin %s on tuntematon"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Komentorivin valitsin %s ei ole totuusarvoinen"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Valitsin %s tarvitsee parametrin"
@@ -2436,343 +2453,361 @@ msgstr "Valitsin %s tarvitsee parametrin"
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Valitsin %s: Asetusarvon määrityksessä on oltava =<arvo>."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Valitsin %s tarvitsee kokonaislukuparametrin, ei \"%s\""
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Valitsin \"%s\" on liian pitkä"
 
-#: 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 "Arvo %s on tuntematon, yritä tosi tai epätosi."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Virheellinen toiminto %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Komento stat ei toiminut liitoskohdalle %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Kansioon %s vaihto ei onnistu"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Komento stat ei toiminut rompulle"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Lukkotiedostoa %s ei voitu avata"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Lukkoa %s ei saada"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Odotettiin %s, mutta sitä ei ollut"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Aliprosessi %s aiheutti suojausvirheen."
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Aliprosessi %s aiheutti suojausvirheen."
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Aliprosessi %s palautti virhekoodin (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Aliprosessi %s lopetti odottamatta"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Tiedostoa %s ei voitu avata"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Putkea %s ei voitu avata"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Prosessien välistä kommunikaatiota aliprosessiin ei saatu luotua"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Pakkaajan käynnistäminen ei onnistunut"
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, 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:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, 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:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Pulmia tiedoston sulkemisessa"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Pulmia tiedoston sulkemisessa"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Pulmia tehtäessä tiedostolle sync"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Pulmia tehtäessä tiedostolle unlink"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Pulmia tehtäessä tiedostolle sync"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Pakettivarasto on tyhjä"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Pakettivarasto on turmeltunut"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "Pakettivaraston versio on yhteensopimaton"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Pakettivarasto on turmeltunut"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Tämä APT ei tue versionhallintajärjestelmää \"%s\""
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "Pakettivarasto on tehty muulle arkkitehtuurille"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Riippuvuudet"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Esiriippuvuudet"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Ehdotukset"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Suosittelut"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Ristiriidat"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Korvaavuudet"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Täydet korvaavuudet"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Rikkoo"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "tärkeä"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "välttämätön"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "perus"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "valinnainen"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "ylimääräinen"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Muodostetaan riippuvuussuhteiden puu"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Mahdolliset versiot"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Luodaan riippuvuudet"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Luetaan tilatiedot"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Tilatiedoston %s avaaminen ei onnistunut"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Avataan %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Rivi %u on liian pitkä lähdeluettelossa %s."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, 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:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, 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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Tiedostoa %s ei voitu avata"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2783,25 +2818,18 @@ msgstr ""
 "%s Conflicts/Pre-Depends -kehämäärittelyn takia. Tämä on usein pahasta, "
 "mutta jos varmasti haluat tehdä niin, käytä APT::Force-LoopBreak -valitsinta."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 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:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2809,11 +2837,11 @@ msgstr ""
 "Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt "
 "paketit."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty."
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2822,233 +2850,195 @@ msgstr ""
 "Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai "
 "käytetty vanhoja. "
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Luettelokansio %spartial puuttuu."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Arkistokansio %spartial puuttuu."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "Luettelokansiota ei voitu lukita"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Noudetaan tiedosto %li / %li (jäljellä %s)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Noudetaan tiedosto %li / %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Menetelmän ajuria %s ei löytynyt"
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Menetelmä %s ei käynnistynyt oikein"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: 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:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "stat %s ei onnistu."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Pakettiluettelonn tai tilatiedoston avaaminen tai jäsennys epäonnistui."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Voit haluta suorittaa apt-get update näiden pulmien korjaamiseksi"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Asetustiedostossa on virheellinen tietue, Package-otsikko puuttuu"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Tunnistetyyppi %s on tuntematon"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Tapahtui virhe käsiteltäessä %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Tapahtui virhe käsiteltäessä %s (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion1)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Tapahtui virhe käsiteltäessä %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Jummijammi, annoit enemmän pakettien nimiä kuin tämä APT osaa käsitellä."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Jummijammi, annoit enemmän versioita kuin tämä APT osaa käsitellä."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Jummijammi, tämä APT ei osaa käsitellä noin montaa kuvausta."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 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:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Tapahtui virhe käsiteltäessä %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "stat ei toiminut lähdepakettiluettelolle %s"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Kootaan tiedostojen tarjoamistietoja"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum ei täsmää"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Tarkistussumma ei täsmää"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3056,12 +3046,12 @@ msgid ""
 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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3070,7 +3060,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:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3079,7 +3069,7 @@ msgstr ""
 "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan "
 "tämän paketin itse."
 
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3087,41 +3077,41 @@ msgstr ""
 "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
 "kenttää."
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Koko ei täsmää"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Huomautus, valitaan %s eikä %s\n"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Virheellinen rivi korvautustiedostossa: %s"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Toimittajan lohkosta %s puuttuu sormenjälki"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3130,41 +3120,41 @@ msgstr ""
 "Käytetään rompun liitoskohtaa %s\n"
 "Liitetään romppu\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Tunnistetaan... "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Tallennettu nimio: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "Irrotetaan romppu...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Käytetään rompun liitoskohtaa %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Irrotetaan romppu\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Odotetaan levyä...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Liitetään romppu...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Etsitään levyltä hakemistotiedostoja...\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3173,22 +3163,22 @@ msgstr ""
 "Hakemistoja löytyi: Asennuspakettien %zu, lähdekoodipakettien %zu, "
 "käännösten %zu ja allekirjoituksia löytyi %zu\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Löytyi nimiö: \"%s\"\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Tuo ei kelpaa nimeksi, yritä uudelleen.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3197,297 +3187,370 @@ msgstr ""
 "Tämä levy on: \n"
 "\"%s\"\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Kopioidaan pakettiluetteloita..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Kirjoitetaan uusi lähdeluettelo\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Kirjoitettiin %i tietuetta.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, 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:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa ja %i paritonta "
 "tiedostoa\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Avataan asetustiedosto %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Kohteen %s tarkistussumma ei täsmää"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Asennus keskeytetään."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Tehtävää %s ei löytynyt"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Pakettia %s ei löytynyt"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "Asennetaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Tehdään asetukset: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Poistetaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s poistettiin kokonaan"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Kansio \"%s\" puuttuu."
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Tiedostoa %s ei voitu avata"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Valmistellaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Puretaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Valmistaudutaan tekemään asetukset: %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "%s asennettu"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Valmistaudutaan poistamaan %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "%s poistettu"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Valmistaudutaan poistamaan %s kokonaan"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s poistettiin kokonaan"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Luettelokansiota ei voitu lukita"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Tiedostoa %s ei voitu avata"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Yhteys katkesi ennenaikaisesti"
 
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 3"
+
+#~ msgid "decompressor"
+#~ msgstr "purkaja"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "read, vielä %lu lukematta mutta tiedosto loppui"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Tapahtui sisäinen virhe, tiedostoa ei löydy"
 
diff --git a/po/fr.po b/po/fr.po
index 4db485879..7d6042082 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+0200\n"
 "PO-Revision-Date: 2011-10-24 22:52+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -19,149 +19,150 @@ msgstr ""
 "X-Generator: Lokalize 1.2\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Le paquet %s de version %s contient une dépendance absente :\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Nombre total de paquets : "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Nombre total de structures de paquets : "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Paquets ordinaires : "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Paquets entièrement virtuels : "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Paquets virtuels simples : "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Paquets virtuels mixtes : "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Manquants : "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Nombre de versions distinctes : "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Nombre de descriptions distinctes : "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Nombre de dépendances : "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Nombre de relations version/fichier : "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Nombre de relations description/fichier : "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Nombre de relations « Provides » : "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Nombre de motifs rationnels : "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Espace occupé par les versions des dépendances : "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Espace disque gaspillé : "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Total de l'espace attribué : "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Fichier %s désynchronisé."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Aucun paquet n'a été trouvé"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "Vous devez fournir au moins un motif de recherche"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 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:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Impossible de trouver le paquet %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Fichiers du paquet :"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Paquets épinglés :"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(non trouvé)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Installé : "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Candidat : "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(aucun)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Épinglage de paquet : "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr " Table de version :"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -235,32 +236,32 @@ msgstr ""
 "plus\n"
 "d'informations.\n"
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 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:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Impossible de monter « %s » sur « %s »"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 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 "
 "cédéroms."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Les paramètres ne sont pas appariés"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -288,12 +289,12 @@ 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:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s n'est pas un paquet Debian valide."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -317,41 +318,41 @@ 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:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Impossible d'écrire sur %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "La liste d'extension du paquet est trop longue"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Erreur lors du traitement du répertoire %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "La liste d'extension des sources est trop grande"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Erreur lors de l'écriture de l'en-tête du fichier contenu"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Erreur du traitement du contenu %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -434,27 +435,27 @@ msgstr ""
 "  -c=? Lit ce fichier de configuration\n"
 "  -o=? Place une option de configuration arbitraire"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Aucune sélection ne correspond"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr ""
 "Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "Base de données corrompue, fichier renommé en %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "Base de données ancienne, tentative de mise à jour de %s\""
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -462,111 +463,111 @@ msgstr ""
 "Le format de la base de données n'est pas valable. Si vous mettez APT à "
 "jour, veuillez supprimer puis recréer la base de données."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Impossible d'ouvrir le fichier de base de données %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Impossible de statuer %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "L'archive n'a pas d'enregistrement de contrôle"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Impossible d'obtenir un curseur"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, 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:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "A : Impossible de statuer %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E : "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "A : "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E : des erreurs sont survenues sur le fichier "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Impossible de résoudre %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Échec du parcours de l'arbre"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Impossible d'ouvrir %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " Délier %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Impossible de lire le lien %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Impossible de délier %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Impossible de lier %s à %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Seuil de delink de %so atteint.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "L'archive ne possède pas de champ de paquet"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "%s ne possède pas d'entrée « override »\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr " le responsable de %s est %s et non %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, 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:717
+#: ftparchive/writer.cc:725
 #, 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"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Échec de l'allocation de mémoire"
 
@@ -576,18 +577,18 @@ msgid "Unable to open %s"
 msgstr "Impossible d'ouvrir %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Entrée « override » %s mal formée ligne %lu n° 1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Entrée « override » %s mal formée %lu n° 2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Entrée « override » %s mal formée %lu n° 3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -595,63 +596,51 @@ msgstr "Entrée « override » %s mal formée %lu n° 3"
 msgid "Failed to read the override file %s"
 msgstr "Impossible de lire le fichier d'« override » %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Algorithme de compression « %s » inconnu"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "La sortie compressée %s a besoin d'un ensemble de compression"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Impossible de créer le tube IPC sur le sous-processus"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Impossible de créer FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Échec du fork"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Fils compressé"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Erreur interne, impossible de créer %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Impossible de créer un sous-processus IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Impossible d'exécuter la compression "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "décompacteur"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "Échec d'entrée/sortie du sous-processus sur le fichier"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Impossible de lire lors du calcul de la somme MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Problème en déliant %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Impossible de changer le nom %s en %s"
@@ -660,75 +649,79 @@ msgstr "Impossible de changer le nom %s en %s"
 msgid "Y"
 msgstr "O"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erreur de compilation de l'expression rationnelle - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "mais %s est installé"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "mais %s devra être installé"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "mais il n'est pas installable"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "mais c'est un paquet virtuel"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "mais il n'est pas installé"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "mais ne sera pas installé"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " ou"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Les NOUVEAUX paquets suivants seront installés :"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Les paquets suivants seront ENLEVÉS :"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Les paquets suivants ont été conservés :"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Les paquets suivants seront mis à jour :"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Les paquets retenus suivants seront changés :"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (en raison de %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -737,59 +730,59 @@ msgstr ""
 "Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n"
 "que vous êtes en train de faire."
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu mis à jour, %lu nouvellement installés, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu réinstallés, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu remis à une version inférieure, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu à enlever et %lu non mis à jour.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu partiellement installés ou enlevés.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Note : sélection de %s pour la tâche « %s »\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Note : sélection de %s pour l'expression rationnelle « %s »\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Le paquet %s est un paquet virtuel fourni par :\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Installé]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr " [Pas de version candidate]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Vous devez explicitement sélectionner un paquet à installer."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -801,130 +794,130 @@ msgstr ""
 "devenu obsolète\n"
 "ou qu'il n'est disponible que sur une autre source\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Cependant les paquets suivants le remplacent :"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Le paquet « %s » n'a pas de version susceptible d'être installée"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "Les paquets virtuels comme « %s » ne peuvent pas être supprimés\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Note : sélection de « %s » au lieu de « %s »\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "%s ignoré : il n'est pas installé et seules des mises à jour ont été "
 "demandées.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s est déjà la plus récente version disponible.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s passé en « installé manuellement ».\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Version choisie « %s » (%s) pour « %s »\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Version choisie « %s » (%s) pour « %s » à cause de « %s »\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Le paquet %s n'est pas installé, et ne peut donc être supprimé\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Correction des dépendances..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " a échoué."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Impossible de corriger les dépendances"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Impossible de minimiser le nombre des paquets mis à jour"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Fait"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ATTENTION : les paquets suivants n'ont pas été authentifiés."
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Avertissement d'authentification ignoré.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Faut-il installer ces paquets sans vérification (o/N) ? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Certains paquets n'ont pas pu être authentifiés"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Il y a des problèmes et -y a été employé sans --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés."
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "Les paquets doivent être enlevés mais la désinstallation est désactivée."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erreur interne. Le tri a été interrompu."
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Étrangement, les tailles ne correspondent pas. Veuillez le signaler par "
@@ -932,21 +925,21 @@ 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Il est nécessaire de prendre %so/%so dans les archives.\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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Il est nécessaire de prendre %so dans les archives.\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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -954,23 +947,23 @@ 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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 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:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Impossible de déterminer l'espace disponible sur %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Pas assez d'espace disponible sur %s"
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération "
@@ -978,11 +971,11 @@ msgstr ""
 
 # The space before the exclamation mark must not be a non-breaking space; this
 # sentence is supposed to be typed by a user who cannot see the difference.
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Oui, faites ce que je vous dis !"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -993,28 +986,28 @@ msgstr ""
 "Pour continuer, tapez la phrase « %s »\n"
 " ?]"
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Annulation."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Souhaitez-vous continuer [O/n] ? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Impossible de récupérer %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Certains fichiers n'ont pu être téléchargés."
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Téléchargement achevé et dans le mode téléchargement uniquement"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1022,20 +1015,20 @@ msgstr ""
 "Impossible de récupérer quelques archives, peut-être devrez-vous lancer apt-"
 "get update ou essayer avec --fix-missing ?"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "l'option --fix-missing et l'échange de support ne sont pas encore reconnus."
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Impossible de corriger le fait que les paquets manquent."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Annulation de l'installation."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1049,39 +1042,39 @@ msgstr[1] ""
 "Les paquets suivants ont disparu du système car tous leurs fichiers\n"
 "ont été remplacés par d'autres paquets :"
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 "Note : cette opération volontaire (effectuée par dpkg) est automatique."
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 "La distribution cible « %s » indisponible pour le paquet « %s » est ignorée"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Choix de « %s » comme paquet source à la place de « %s »\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "La version « %s » indisponible du paquet « %s » est ignorée"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "La commande de mise à jour ne prend pas de paramètre"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Aucune suppression n'est censée se produire : impossible de lancer "
 "« Autoremover »"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1100,16 +1093,16 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "L'information suivante devrait vous aider à résoudre la situation : "
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 "Erreur interne, l'outil de suppression automatique a cassé quelque chose."
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1121,7 +1114,7 @@ msgstr[1] ""
 "Les paquets suivants ont été installés automatiquement et ne sont plus "
 "nécessaires :"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1131,20 +1124,20 @@ msgstr[0] ""
 msgstr[1] ""
 "%lu paquets ont été installés automatiquement et ne sont plus nécessaires.\n"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Veuillez utiliser « apt-get autoremove » pour les supprimer."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1152,7 +1145,7 @@ msgstr ""
 "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n"
 "(ou indiquez une solution)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1164,77 +1157,77 @@ 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:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Paquets défectueux"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Les paquets supplémentaires suivants seront installés : "
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Paquets suggérés :"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Paquets recommandés :"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossible de trouver le paquet %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s passé en « installé automatiquement ».\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
-"Cette commande est obsolète. Veuillez utiliser « apt-mark auto » et "
-"« apt-mark manual »."
+"Cette commande est obsolète. Veuillez utiliser « apt-mark auto » et « apt-"
+"mark manual »."
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Calcul de la mise à jour... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Échec"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Fait"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 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:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Impossible de verrouiller le répertoire de téléchargement"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr "Téléchargement de %s %s"
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 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:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, 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:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1244,7 +1237,7 @@ msgstr ""
 "suivi de versions « %s » à l'adresse :\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1256,70 +1249,70 @@ msgstr ""
 "pour récupérer les dernières mises à jour (éventuellement non encore "
 "publiées) du paquet.\n"
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, 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:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, 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:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Récupération des sources %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Échec lors de la récupération de quelques archives."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "La commande de décompactage « %s » a échoué.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, 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:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "La commande de construction « %s » a échoué.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Échec du processus fils"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 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:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -1329,17 +1322,17 @@ msgstr ""
 "consulter la section à propos de APT::Architectures dans la page de manuel "
 "apt.conf(5)."
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, 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:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s n'a pas de dépendance de construction.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1348,7 +1341,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:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1357,14 +1350,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:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1373,40 +1366,40 @@ 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:2957
+#: cmdline/apt-get.cc:2992
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
-"La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s n'a "
-"pas de version disponible."
+"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:2980
+#: cmdline/apt-get.cc:3015
 #, 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:2996
+#: cmdline/apt-get.cc:3031
 #, 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:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Impossible d'activer les dépendances de construction"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Journal des modifications pour %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Modules reconnus :"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1496,7 +1489,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:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1510,33 +1503,33 @@ msgstr ""
 "      et la situation n'est donc pas forcément représentative\n"
 "      de la réalité !"
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Atteint "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Réception de : "
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ign "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Err "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%so réceptionnés en %s (%so/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [En cours]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1547,48 +1540,64 @@ msgstr ""
 "« %s »\n"
 "dans le lecteur « %s » et appuyez sur la touche Entrée\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s ne peut pas être marqué car il n'est pas installé.\n"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s était déjà marqué comme installé manuellement.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s était déjà marqué comme installé automatiquement.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s était déjà marqué comme figé (« hold »).\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s était déjà marqué comme non figé.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s passé en figé (« hold »).\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Annulation de l'état figé pour %s.\n"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 "Échec de l'exécution de dpkg. Possédez-vous les privilèges du "
 "superutilisateur ?"
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1610,11 +1619,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Enregistrement de paquet inconnu !"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1678,198 +1687,200 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Fusion des informations disponibles"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Échec de création de tubes"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Impossible d'exécuter gzip "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Archive corrompue"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 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:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Type d'en-tête %u inconnu pour TAR, partie %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Signature d'archive invalide"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Erreur de lecture de l'en-tête du membre d'archive"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "En-tête du membre d'archive %s non valable"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "En-tête du membre d'archive non-valable"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "L'archive est trop petite"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Échec de la lecture des en-têtes d'archive"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "DropNode appelé sur un nœud toujours lié"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Impossible de situer l'élément haché !"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Échec lors de l'allocation de la déviation"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Erreur interne dans AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Essaye d'écraser une déviation, %s -> %s et %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Addition double d'une déviation %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Fichier de configuration en double %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Erreur d'écriture du fichier %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Échec de clôture du fichier %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Le chemin %s est trop long"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Veuillez décompresser %s plus d'une fois"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Le répertoire %s est détourné"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Le chemin de déviation est trop long"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 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:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Le chemin est trop long"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, 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:429
+#: apt-inst/extract.cc:432
 #, 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"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossible de lire %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Impossible de statuer pour %s."
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Impossible de supprimer %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Impossible de créer %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Impossible de statuer pour %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "Les répertoires info et temp doivent se trouver sur le même système de "
 "fichiers"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Lecture des listes de paquets"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Impossible de changer pour le répertoire d'administration %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Erreur interne lors de l'obtention d'un nom de paquet"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Lecture de la liste de fichiers"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1880,115 +1891,116 @@ msgstr ""
 "pas à restaurer ce fichier, veuillez le vider et réinstaller immédiatement "
 "la même version du paquet !"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Échec de la lecture du fichier de liste %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Erreur interne lors de l'obtention d'un Nœud"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Impossible d'ouvrir le fichier des déviations %sdiversions "
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "Le fichier des déviations est corrompu"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Ligne invalide dans le fichier des déviations : %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Erreur interne en ajoutant une déviation"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "Le cache des paquets doit être initialisé en premier"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Impossible de trouver un en-tête « Package: », décalage %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Mauvaise section « ConfFile » dans le fichier « status ». Décalage %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Erreur lors du traitement de la somme MD5. Décalage %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Ce n'est pas une archive DEB valide,  partie « %s » manquante"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 "Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s », « %s » "
 "ou « %s »"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Impossible d'accéder à %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Erreur interne, ne peut localiser la partie %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Impossible de localiser un fichier de contrôle valide"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Fichier de contrôle non traitable"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr "Les fichiers vides ne peuvent être des archives valables"
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Ne parvient pas à ouvrir le tube pour %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Erreur de lecture du processus %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Impossible de statuer"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Impossible de modifier l'heure "
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Impossible de lire la base de données %s du cédérom"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1996,58 +2008,58 @@ msgstr ""
 "Veuillez utiliser apt-cdrom afin de faire reconnaître ce cédérom par votre "
 "APT. apt-get update ne peut être employé pour ajouter de nouveaux cédéroms"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "Mauvais cédérom"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 "Impossible de démonter le cédérom dans %s, il doit toujours être en cours "
 "d'utilisation."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Disque non trouvé."
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Fichier non trouvé"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Liens invalides, les liens locaux ne doivent pas débuter avec //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Connexion en cours"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Impossible de déterminer le nom de la machine distante"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Impossible de déterminer le nom local"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Le serveur a refusé notre connexion et a répondu : %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER incorrect, le serveur a répondu : %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS incorrect, le serveur a répondu : %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2055,204 +2067,204 @@ msgstr ""
 "Un serveur proxy a été spécifié, mais aucun script de connexion, Acquire::"
 "ftp::ProxyLogin est vide."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 "La commande « %s » du script de connexion a échoué, le serveur a répondu : %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Échec de TYPE, le serveur a répondu : %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Dépassement du délai de connexion"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Le serveur a fermé la connexion"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Erreur de lecture"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Une réponse a fait déborder le tampon."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Corruption du protocole"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Erreur d'écriture"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Impossible de créer un connecteur"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Impossible de se connecter sur le port de données, délai de connexion dépassé"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Impossible de se connecter au port en mode passif."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "gettaddrinfo n'a pu obtenir un port d'écoute"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Impossible de se connecter à un port"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Impossible d'écouter sur le port"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Impossible de déterminer le nom du port"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Impossible d'envoyer la commande PORT"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Famille d'adresses %u inconnue (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT a échoué, le serveur a répondu : %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Délai de connexion au port de données dépassé"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Impossible d'accepter une connexion"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Problème de hachage du fichier"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Impossible de récupérer le fichier, le serveur a répondu « %s »"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Pas de réponse du port données dans les délais"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Le transfert de données a échoué, le serveur a répondu « %s »"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Requête"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Impossible d'invoquer "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Connexion à %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP : %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Impossible d'initialiser la connexion à %s: %s (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Connexion à %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Ne parvient pas à résoudre « %s »"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Erreur temporaire de résolution de « %s »"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, 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:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Impossible de se connecter à %s:%s :"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Au moins une signature non valable a été rencontrée."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Erreur inconnue à l'exécution de gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Les signatures suivantes ne sont pas valables :\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2260,106 +2272,111 @@ msgstr ""
 "Les signatures suivantes n'ont pas pu être vérifiées car la clé publique "
 "n'est pas disponible :\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Attente des fichiers d'en-tête"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "J'ai une simple ligne d'en-tête au-dessus du caractère %u"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Mauvaise ligne d'en-tête"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Le serveur http a envoyé une réponse dont l'en-tête est invalide"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Ce serveur http possède un support des limites non-valide"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Format de date inconnu"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Sélection défaillante"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Délai de connexion dépassé"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Erreur d'écriture du fichier de sortie"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Erreur d'écriture sur un fichier"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Erreur d'écriture sur le fichier"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 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:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Erreur de lecture du serveur"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Échec de la troncature du fichier"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Mauvais en-tête de donnée"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Échec de la connexion"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Impossible de mapper un fichier vide en mémoire"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Impossible de dupliquer le descripteur de fichier %i"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Impossible de réaliser un mapping de %lu octets en mémoire"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "Impossible de fermer la « mmap »"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "Impossible de synchroniser la « mmap »"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Impossible de réaliser un mapping de %lu octets en mémoire"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Échec de la troncature du fichier"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2369,7 +2386,7 @@ msgstr ""
 "Vous devriez augmenter la taille de APT::Cache-Limit, dont la valeur "
 "actuelle est de %lu (voir « man 5 apt.conf »)."
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2378,7 +2395,7 @@ msgstr ""
 "Impossible d'augmenter la taille de la « mmap » car la limite de %lu octets "
 "est déjà atteinte."
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2409,97 +2426,97 @@ msgstr "%limin %lis"
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "La sélection %s n'a pu être trouvée"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Type d'abréviation non reconnue : « %c »"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Ouverture du fichier de configuration %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Erreur syntaxique %s:%u : le bloc commence sans aucun nom."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Erreur syntaxique %s:%u : balise mal formée"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Erreur syntaxique %s:%u : valeur suivie de choses illicites"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Erreur syntaxique %s:%u : ces directives ne peuvent être appliquées qu'au "
 "niveau le plus haut"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Erreur syntaxique %s:%u: trop de niveaux d'imbrication d'includes"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Erreur syntaxique %s:%u : inclus à partir d'ici"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Erreur syntaxique %s:%u : directive « %s » non tolérée"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Erreur de syntaxe %s:%u : la directive « clear » a besoin d'un arbre "
 "d'options comme paramètre"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Erreur syntaxique %s:%u : valeur aberrante à la fin du fichier"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Erreur !"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Fait"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "L'option « %c » de la ligne de commande [d'origine %s] est inconnue."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "L'option %s de la ligne de commande n'est pas reconnue"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "L'option %s de la ligne de commande n'est pas une valeur booléenne"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "L'option %s nécessite un paramètre."
@@ -2509,84 +2526,84 @@ msgstr "L'option %s nécessite un paramètre."
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Option %s : l'item configuration doit être spécifiée avec un =<val>."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "L'option %s prend un nombre entier en paramètre, et non « %s »"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "L'option « %s » est trop longue"
 
-#: 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 "La signification %s n'est pas comprise, veuillez essayer vrai ou faux."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "L'opération %s n'est pas valable"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Impossible de localiser le point de montage %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Impossible d'accéder à %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Impossible d'accéder au cédérom."
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Impossible d'ouvrir le fichier verrou %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Impossible d'obtenir le verrou %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, 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:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, 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:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, 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:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2594,270 +2611,283 @@ msgstr ""
 "« %s » dans le répertoire « %s » a été ignoré car il utilise une extension "
 "non valable"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "A attendu %s mais il n'était pas présent"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, 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:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, 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:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, 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:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, 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:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Impossible d'ouvrir le fichier %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Impossible d'ouvrir le descripteur de fichier %d"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Impossible de créer un sous-processus IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Impossible d'exécuter la compression "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "lu(s), %lu restant à lire, mais rien n'est disponible"
 
-#: apt-pkg/contrib/fileutl.cc:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "écrit(s), %lu restant à écrire, mais l'écriture est impossible"
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problème de fermeture du fichier gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problème de fermeture du fichier %s"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, 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:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problème de suppression du lien %s"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Problème de synchronisation du fichier"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Cache des paquets vide"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Le fichier de cache des paquets est corrompu"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "Le fichier de cache des paquets a une version incompatible"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Le fichier de cache des paquets est corrompu"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Cet APT ne supporte pas le système de version « %s »"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 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:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Dépend"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Pré-Dépend"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Suggère"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Recommande"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Est en conflit avec"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Remplace"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Rend obsolète"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Casse"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "Améliore"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "important"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "nécessaire"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "optionnel"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "supplémentaire"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Construction de l'arbre des dépendances"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Versions possibles"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Génération des dépendances"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Lecture des informations d'état"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Impossible d'ouvrir le fichier d'état %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Erreur d'écriture du fichier d'état temporaire %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Impossible de traiter le fichier %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Impossible de traiter le fichier %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 "Ligne %lu mal formée dans la liste des sources %s (impossible d'analyser "
 "[option])"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 "Ligne %lu mal formée dans la liste de sources %s ([option] trop courte)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 "Ligne %lu mal formée dans la liste des sources %s ([%s] n'est pas une "
 "affectation)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 "Ligne %lu mal formée dans la liste des sources %s ([%s] n'a pas de clé)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 "Ligne %lu mal formée dans la liste des sources %s ([%s] la clé %s n'a pas de "
 "valeur)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 "Ligne %lu mal formée dans la liste des sources %s (distribution absolue)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 "Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Ouverture de %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 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:281
+#: apt-pkg/sourcelist.cc:285
 #, 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:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2867,7 +2897,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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Impossible d'ouvrir le fichier « %s »"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2879,22 +2914,12 @@ msgstr ""
 "Depends. C'est souvent une mauvaise chose, mais si vous souhaitez réellement "
 "le faire, activez l'option APT::Force-LoopBreak."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"Impossible d'effectuer la configuration immédiate du paquet « %s », déjà "
-"décompressé. Veuillez consulter la page de manuel apt.conf(5) et notamment "
-"la section à propos de APT::Immediate-Configure, pour plus d'informations."
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Le type de fichier d'index « %s » n'est pas accepté"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2902,7 +2927,7 @@ msgstr ""
 "Le paquet %s doit être réinstallé, mais il est impossible de trouver son "
 "archive."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2910,13 +2935,13 @@ msgstr ""
 "Erreur, pkgProblemResolver::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:1160
+#: apt-pkg/algorithms.cc:1193
 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:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2924,84 +2949,84 @@ 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:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Le répertoire %spartial pour les listes n'existe pas."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Le répertoire d'archive %spartial n'existe pas."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "Impossible de verrouiller le répertoire %s"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Téléchargement du fichier %li sur %li (%s restant)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Téléchargement du fichier %li sur %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Le pilote pour la méthode %s n'a pu être trouvé."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "La méthode %s n'a pas démarré correctement"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: 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:163
+#: 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"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Impossible de localiser %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 "Vous devez insérer quelques adresses « sources » dans votre sources.list"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Les listes de paquets ou le fichier « status » ne peuvent être analysés ou "
 "lus."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problèmes."
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "La liste des sources ne peut être lue."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, c-format
 msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
@@ -3010,137 +3035,99 @@ msgstr ""
 "La valeur « %s » n'est pas valable pour APT::Default-Release car cette "
 "version ne fait pas partie des sources disponibles."
 
-#: apt-pkg/policy.cc:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "Enregistrement non valable dans le fichier de préférences %s, aucune entrée "
 "« Package »."
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Type d'épinglage %s inconnu"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'épinglage"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Le cache possède un système de version incompatible"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Erreur apparue lors du traitement de %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Erreur apparue lors du traitement de %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Erreur apparue lors du traitement de %s (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Erreur apparue lors du traitement de %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Erreur apparue lors du traitement de %s (NewVersion%d)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Erreur apparue lors du traitement de %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Erreur apparue lors du traitement de %s (NewFileDesc2)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Erreur apparue lors du traitement de %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Vous avez dépassé le nombre de noms de paquets que cette version d'APT est "
 "capable de traiter."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Vous avez dépassé le nombre de versions que cette version d'APT est capable "
 "de traiter."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Vous avez dépassé le nombre de descriptions que cette version d'APT est "
 "capable de traiter."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Vous avez dépassé le nombre de dépendances que cette version d'APT est "
 "capable de traiter."
 
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Erreur apparue lors du traitement de %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Impossible de localiser la liste des paquets sources %s"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Assemblage des fichiers listés dans les champs Provides"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr ""
 "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "impossible de changer le nom, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "Somme de contrôle MD5 incohérente"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Somme de contrôle de hachage incohérente"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3149,32 +3136,32 @@ 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
-"Le fichier « Release » pour %s a expiré (plus valable depuis %s). Les mises à "
-"jour depuis ce dépôt  ne s'effectueront pas."
+"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:1510
 #, 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:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3185,12 +3172,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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Erreur de GPG : %s : %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3199,7 +3186,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:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3208,7 +3195,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:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3216,41 +3203,41 @@ msgstr ""
 "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
 "pour le paquet %s."
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Taille incohérente"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Impossible d'analyser le fichier Release %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Pas de sections dans le fichier Release %s"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, 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:110
+#: apt-pkg/indexrecords.cc:118
 #, 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:125
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Entrée « Date » non valable dans le fichier Release %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3259,41 +3246,41 @@ msgstr ""
 "Utilisation du point de montage %s pour le cédérom\n"
 "Montage du cédérom\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Identification..."
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Étiquette stockée : %s\n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "Démontage du cédérom...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Utilisation du point de montage %s pour le cédérom\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Démontage du cédérom\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Attente du disque...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Montage du cédérom...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Examen du disque à la recherche de fichiers d'index...\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3302,7 +3289,7 @@ msgstr ""
 "%zu index de paquets trouvés, %zu index de sources, %zu index de traductions "
 "et %zu signatures\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3310,16 +3297,16 @@ msgstr ""
 "Aucun fichier de paquets trouvé. Ceci n'est peut-être pas un disque Debian "
 "ou bien l'architecture est-elle incorrecte."
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Étiquette « %s » trouvée\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Ce nom n'est pas valable, veuillez recommencer.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3328,96 +3315,96 @@ msgstr ""
 "Ce disque s'appelle :\n"
 "« %s »\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Copie des listes de paquets..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Écriture de la nouvelle liste de sources\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 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:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i enregistrements écrits.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i enregistrements écrits avec %i fichiers manquants.\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "%i enregistrements écrits avec %i fichiers manquants et %i qui ne "
 "correspondent pas\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Fichier %s inexistant ignoré"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Impossible de trouver l'enregistrement d'authentification pour %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Somme de contrôle de hachage incohérente pour %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "Pas de porte-clés installé dans %s."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "La version  « %s » de « %s » est introuvable"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "La version « %s » de « %s » n'a pu être trouvée"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Impossible de trouver la tâche « %s »"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 "Impossible de trouver de paquet correspondant à l'expression rationnelle "
 "« %s »"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Impossible de choisir les versions du paquet « %s » qui n'est qu'un paquet "
 "virtuel"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3426,127 +3413,151 @@ msgstr ""
 "Impossible de choisir une version installée ou candidate du paquet « %s » "
 "qui n'en n'a aucune"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Impossible de choisir une nouvelle version du paquet « %s » qui n'est qu'un "
 "paquet virtuel"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Impossible de choisir une version candidate du paquet « %s » qui n'en n'a pas"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Impossible de choisir la version installée du paquet « %s » qui n'est pas "
 "installé"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "Installation de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Configuration de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Suppression de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "Suppression complète de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Disparition de %s constatée"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Répertoire %s inexistant"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Impossible d'ouvrir le fichier « %s »"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Préparation de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Décompression de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Préparation de la configuration de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "%s installé"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Préparation de la suppression de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "%s supprimé"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Préparation de la suppression complète de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s complètement supprimé"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "Exécution de dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "problème de dépendances : laissé non configuré"
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3554,14 +3565,14 @@ 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:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 "Aucun rapport « apport » n'a été créé car un disque plein a été signalé"
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3569,14 +3580,14 @@ 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:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Aucun « apport » n'a été créé car une erreur d'entrée/sortie de dpkg a été "
 "signalée"
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3585,7 +3596,7 @@ msgstr ""
 "Impossible de verrouiller le répertoire d'administration (%s). Il est "
 "possible qu'un autre processus l'utilise."
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
@@ -3594,7 +3605,7 @@ msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3602,30 +3613,30 @@ msgstr ""
 "dpkg a été interrompu. Il est nécessaire d'utiliser « %s » pour corriger le "
 "problème."
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Non verrouillé"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "Aucun fichier miroir « %s » n'a été trouvé"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Impossible de lire le fichier de miroir « %s »."
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Miroir : %s]"
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3634,7 +3645,7 @@ msgstr ""
 "Impossible de modifier %s avec mmap et l'utilisation des opérations de "
 "fichiers : le correctif semble être corrompu."
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3643,10 +3654,71 @@ msgstr ""
 "Impossible de modifier %s avec mmap (sans échec particulier de mmap) : le "
 "correctif semble être corrompu."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Connexion fermée prématurément"
 
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Entrée « override » %s mal formée ligne %lu n° 1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Entrée « override » %s mal formée %lu n° 2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Entrée « override » %s mal formée %lu n° 3"
+
+#~ msgid "decompressor"
+#~ msgstr "décompacteur"
+
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr ""
+#~ "Note : cette opération volontaire (effectuée par dpkg) est automatique."
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "lu(s), %lu restant à lire, mais rien n'est disponible"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "écrit(s), %lu restant à écrire, mais l'écriture est impossible"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "Impossible d'effectuer la configuration immédiate du paquet « %s », déjà "
+#~ "décompressé. Veuillez consulter la page de manuel apt.conf(5) et "
+#~ "notamment la section à propos de APT::Immediate-Configure, pour plus "
+#~ "d'informations."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Erreur apparue lors du traitement de %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Erreur apparue lors du traitement de %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Erreur apparue lors du traitement de %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Erreur apparue lors du traitement de %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Erreur apparue lors du traitement de %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Erreur apparue lors du traitement de %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Erreur interne, ne peut localiser le membre"
 
diff --git a/po/gl.po b/po/gl.po
index a4548740e..12ffae777 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_gl\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -22,151 +22,152 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Poedit-Language: Galician\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "O paquete %s versión %s ten unha dependencia incumprida:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Número total de nomes de paquetes : "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Estruturas de paquetes totais: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Paquetes normais: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Paquetes virtuais puros: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Paquetes virtuais simples: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Paquetes virtuais mixtos: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Non atopados: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Número total de versións distintas: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Número total de descricións distintas: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Número total de dependencias: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Número total de relacións versión/ficheiro: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Número total de relacións descrición/ficheiro: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Número total de asignacións provistas: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Número total de cadeas: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Espazo total de versións de dependencias: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Espazo de reserva total: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Espazo total contabilizado: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "O ficheiro de paquete %s está sen sincronizar."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Non se atopou ningún paquete"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "Debe fornecer cando menos un patrón de busca"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Non foi posíbel atopar o paquete %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Ficheiros de paquetes:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Paquetes inmobilizados:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(non se atopou)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(ningún)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Inmobilizado: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Táboa de versións:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -240,28 +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:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Insira un disco na unidade e prema Intro"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Produciuse un fallo ao montar «%s» en «%s»"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 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."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Os argumentos non van en parellas"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -290,12 +291,12 @@ msgstr ""
 "  -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s non é un paquete DEB válido."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -320,40 +321,40 @@ msgstr ""
 "  -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Non é posíbel escribir en %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Non é posíbel obter a versión de debconf. Debconf está instalado?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "A lista de extensións de paquetes é longa de máis"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Produciuse un erro ao procesar o directorio %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "A lista de extensións de fontes é longa de máis"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Produciuse un erro ao gravar a cabeceira no ficheiro de contido"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Produciuse un erro ao procesar o contido %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -436,26 +437,26 @@ msgstr ""
 "  -c=?  Le este ficheiro de configuración\n"
 "  -o=?  Estabelece unha opción de configuración"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Non coincide ningunha selección"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Faltan ficheiros no grupo de ficheiros de paquetes «%s»"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "A base de datos estaba danada, cambiouse o nome do ficheiro a %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "A base de datos é antiga, tentando anovar %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -463,111 +464,111 @@ msgstr ""
 "O formato da base de datos non é correcto. Se a anovou desde unha versión "
 "antiga de apt, retirea e volva a crear a base de datos"
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Non é posíbel abrir o ficheiro de base de datos %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Non foi posíbel determinar o estado %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "O arquivo non ten un rexistro de control"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Non é posíbel obter un cursor"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A: non é posíbel ler o directorio %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "A: non é posíbel atopar %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "A: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: os erros aplícanse ao ficheiro "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Non foi posíbel solucionar %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Fallou o percorrido da árbore"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Non foi posíbel abrir %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DesLig %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Non foi posíbel ler a ligazón %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Non foi posíbel desligar %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Non foi posíbel ligar %s con %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Acadouse o límite de desligado de %sB.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "O arquivo non tiña un campo Package"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s non ten unha entrada de «override»\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  O mantedor de %s é %s, non %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, 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:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s tampouco ten unha entrada de «override» de binarios\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Non foi posíbel reservar memoria"
 
@@ -577,18 +578,18 @@ msgid "Unable to open %s"
 msgstr "Non é posíbel puido abrir %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "«Override» %s liña %lu incorrecta (1)"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "«Override» %s liña %lu incorrecta (2)"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "«Override» %s liña %lu incorrecta (3)"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -596,63 +597,51 @@ msgstr "«Override» %s liña %lu incorrecta (3)"
 msgid "Failed to read the override file %s"
 msgstr "Non foi posíbel ler o ficheiro de «override» %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Algoritmo de compresión «%s» descoñecido"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "A saída comprimida %s precisa dun conxunto de compresión"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Non foi posíbel crear a canle IPC ao subproceso"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Non foi posíbel crear o FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Non foi posíbel facer a bifurcación"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Fillo de compresión"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Produciuse un erro interno, non foi posíbel crear %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Non foi posíbel crear o IPC do subproceso"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Non foi posíbel executar o compresor "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "descompresor"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "Produciuse un fallo na E/S do subproceso/ficheiro"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Non foi posíbel ler ao calcular o MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Xurdiu un problema ao desligar %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Non foi posíbel cambiar o nome de %s a %s"
@@ -661,75 +650,79 @@ msgstr "Non foi posíbel cambiar o nome de %s a %s"
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Produciuse un erro na compilación da expresión regular - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "mais %s está instalado"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "mais vaise instalar %s"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "mais non é instalábel"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "mais é un paquete virtual"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "mais non está instalado"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "mais non se vai a instalar"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " ou"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Os seguintes paquetes NOVOS hanse instalar:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Vanse RETIRAR os paquetes seguintes:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Consérvanse os seguintes paquetes:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Vanse anovar os paquetes seguintes:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Vanse REVERTER os seguintes paquetes :"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Vanse modificar os paquetes retidos seguintes:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (por mor de %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -737,59 +730,59 @@ msgstr ""
 "AVISO: Retiraranse os seguintes paquetes esenciais.\n"
 "Isto NON se debe facer a menos que saiba exactamente o que está a facer!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu anovados, %lu instalados, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu revertidos, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "Vanse retirar %lu e deixar %lu sen anovar.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu non instalados ou retirados de todo.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Nota, seleccione «%s» para a tarefa «%s»\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Nota, seleccione «%s» para a expresión regular «%s»\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "O paquete %s é un paquete virtual fornecido por:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Instalado]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr " [Non hai unha versión candidata]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Debería escoller un para instalar."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -800,128 +793,128 @@ msgstr ""
 "Isto pode significar que falta o paquete, está obsoleto ou só está\n"
 "dispoñíbel noutra fonte.\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Porén, os seguintes paquetes substitúeno:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "O paquete «%s» non ten unha instalación candidata"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "Non se poden retirar os paquetes virtuais como «%s»\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Nota, seleccione «%s» no canto de «%s»\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Omítese %s, xa está instalado e non se especificou a anovación.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "Omitindo %s, non está instalado e só se solicitaron as anovacións.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "A reinstalación de %s non é posíbel, non se pode descargar.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s xa é a versión máis recente.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s cambiado a instalado manualmente.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versión seleccionada «%s» (%s) para «%s»\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Versión seleccionada «%s» (%s) para «%s» xa que «%s»\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "O paquete %s non está instalado, así que non foi retirado\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Corrixindo as dependencias..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " fallou."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Non foi posíbel corrixir as dependencias."
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Non foi posíbel minimizar o conxunto de anovacións"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Feito"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Pode querer executar «apt-get -f install» para corrixilos."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependencias incumpridas. Probe a empregar -f."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISO: Non se poden autenticar os seguintes paquetes!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Ignórase o aviso de autenticación.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Instalar estes paquetes sen verificación [s/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Non foi posíbel autenticar algúns paquetes"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Xurdiron problemas e empregouse -y sen --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "Produciuse un erro interno, chamouse a InstallPackages con paquetes "
 "estragados."
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Hai que retirar paquetes mais o retirado está desactivado."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Produciuse un erro interno; non rematou a ordenación"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Que estraño... Os tamaños non coinciden; envíe un correo-e a apt@packages."
@@ -929,52 +922,52 @@ 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Ten que recibir %sB/%sB de arquivos.\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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Ten que recibir %sB de arquivos.\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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Despois desta operación ocuparanse %sB de disco adicionais.\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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 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:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Non foi posíbel determinar o espazo libre en %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Non hai espazo libre abondo en %s."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Especificouse «Só triviais» mais esta non é unha operación trivial."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Si, fai o que digo!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -985,28 +978,28 @@ msgstr ""
 "Para continuar escriba a frase «%s»\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Interromper."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Quere continuar [S/n]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Non foi posíbel obter %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Non foi posíbel descargar algúns ficheiros"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Completouse a descarga no modo de só descargas"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1014,20 +1007,20 @@ msgstr ""
 "Non foi posíbel obter algúns arquivos; probe con apt-get update ou --fix-"
 "missing."
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "O emprego conxunto de --fix-missing e intercambio de discos non está admitido"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Non é posíbel corrixir os paquetes non dispoñíbeis."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Interrompendo a instalación."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1041,37 +1034,37 @@ msgstr[1] ""
 "Os seguintes paquetes desapareceron do seu sistema e todos os \n"
 "ficheiros serán sobrescritos por outros paquetes:"
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Nota: Isto será feito automaticamente por dpkg."
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Ignorase a versión de destino «%s» non dispoñíbel do paquete «%s»"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Tome «%s» como paquete fonte no canto de «%s»\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Ignorar a versión non dispoñíbel «%s» do paquete «%s»"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "A orde «update» non toma argumentos"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Non se agarda que eliminemos cousas, non se pode iniciar o Retirado "
 "automático"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1089,15 +1082,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "A seguinte información pode axudar a solucionar a situación:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Produciuse un erro interno, o Retirado automático estragou cousas"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1109,7 +1102,7 @@ msgstr[1] ""
 "Os seguintes paquetes foron instalados automaticamente e xa non son "
 "necesarios:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1118,19 +1111,19 @@ msgstr[0] "%lu paquete foi instalado automaticamente e xa non é necesario.\n"
 msgstr[1] ""
 "%lu paquetes foron instalados automaticamente e xa non son necesarios.\n"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Empregue «apt-get autoremove» para eliminalos."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Produciuse un erro interno, AllUpgrade estragou cousas"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Pode querer executar «apt-get -f install» para corrixir isto:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1138,7 +1131,7 @@ msgstr ""
 "Dependencias incumpridas. Probe «apt-get -f install» sen paquetes (ou "
 "especifique unha solución)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1151,73 +1144,73 @@ msgstr ""
 "algúns paquetes solicitados aínda non se creasen ou que se movesen da "
 "entrada."
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Paquetes estragados"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Instalaranse os seguintes paquetes extra:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Paquetes suxeridos:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Paquetes recomendados:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Non foi posíbel atopar o paquete %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, 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:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Calculando a anovación... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Fallou"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Feito"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Produciuse un erro interno, o solucionador interno estragou cousas"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Non é posíbel bloquear o directorio de descargas"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr "Descargando %s %s"
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 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:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, 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:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1226,7 +1219,7 @@ msgstr ""
 "AVISO: o paquete «%s» mantense no sistema de control de versións «%s» en:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1238,87 +1231,87 @@ msgstr ""
 "para obter as últimas actualizacións (posibelmente non publicadas) do "
 "paquete.\n"
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Omítese o ficheiro xa descargado «%s»\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, 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:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter fonte %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Non se puideron obter algúns arquivos."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Fallou a orde de desempaquetado «%s».\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, 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:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Fallou a orde de construción de «%s».\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "O proceso fillo fallou"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 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:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, 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:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s non ten dependencias de compilación.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1327,7 +1320,7 @@ msgstr ""
 "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
 "paquete %s"
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1336,14 +1329,14 @@ msgstr ""
 "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
 "paquete %s"
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1352,7 +1345,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:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1361,30 +1354,30 @@ msgstr ""
 "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
 "paquete %s"
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, 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:2996
+#: cmdline/apt-get.cc:3031
 #, 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:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Non se puideron procesar as dependencias de construción"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Rexistro de cambios de %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Módulos admitidos:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1477,7 +1470,7 @@ msgstr ""
 "para obter mais información e opcións\n"
 "                       Este APT ten poderes da Super Vaca.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1490,33 +1483,33 @@ msgstr ""
 "      Lembre tamén que o bloqueo está desactivado,\n"
 "      polo que non debe depender da relevancia da situación actual real."
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Teño "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Rcb:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ign "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Err "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Obtivéronse %sB en %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Traballando]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1527,46 +1520,62 @@ msgstr ""
 " «%s»\n"
 "na unidade «%s» e prema Intro\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "mais non está instalado"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s cambiado a instalado manualmente.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s está estabelecido para a súa instalación automática.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s xa é a versión máis recente.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s xa é a versión máis recente.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s cambiado a instalado manualmente.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Non foi posíbel abrir %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1588,11 +1597,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Rexistro de paquete descoñecido!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1654,197 +1663,199 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Mesturando a información sobre paquetes dispoñíbeis"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Non foi posíbel crear as canles"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Non foi posíbel executar gzip "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Arquivo danado"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "A suma de comprobación do arquivo tar non coincide, está danado"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Tipo de cabeceira TAR %u descoñecido, membro %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Sinatura de arquivo incorrecta"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Produciuse un erro ao ler a cabeceira do membro do arquivo"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "Cabeceira do membro do arquivo incorrecta %s"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Cabeceira do membro do arquivo incorrecta"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "O arquivo é curto de máis"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Non foi posíbel ler as cabeceiras dos arquivos"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "Chamouse a DropNode nun nodo aínda ligado"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Non foi posíbel atopar o elemento hash"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Non foi posíbel reservar un desvío"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Produciuse un erro interno en AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Téntase sobrescribir un desvío, %s -> %s e %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Desvío %s -> %s engadido dúas veces"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Ficheiro de configuración %s/%s duplicado"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Non foi posíbel escribir no ficheiro «%s»"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Non foi posíbel pechar o ficheiro %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "A ruta %s é longa de máis"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Desempaquetando %s máis dunha vez"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "O directorio %s está desviado"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "A ruta do desvío é longa de máis"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 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:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "A ruta é longa de máis"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Coincidencia na sobrescritura sen versión para %s"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "O ficheiro %s/%s sobrescribe o do paquete %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Non é posíbel ler %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Non é posíbel determinar o estado %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Non foi posíbel retirar %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Non é posíbel crear %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Non foi posíbel atopar %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "Os directorios info e temp teñen que estar no mesmo sistema de ficheiros"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Lendo as listas de paquetes"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Non foi posíbel cambiar ao directorio de administración %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Produciuse un erro interno ao obter un nome de paquete"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Lendo a lista de ficheiros"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1854,114 +1865,115 @@ msgstr ""
 "Non foi posíbel abrir o ficheiro de listas «%sinfo/%s». Se non pode "
 "recuperalo, baléireo e reinstale a mesma versión do paquete."
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Non foi posíbel ler o ficheiro de listas %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Produciuse un erro interno ao obter un nodo"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Non foi posíbel abrir o ficheiro de desvíos %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "O ficheiro de desvíos está danado"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Liña incorrecta no ficheiro de desvíos: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Produciuse un erro interno ao engadir un desvío"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "Antes ten que inicializarse a caché de paquetes"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Non foi posíbel atopar unha cabeceira Package:, desprazamento %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Sección ConfFile incorrecta no ficheiro de estado. Desprazamento %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Produciuse un erro ao analizar o MD5. Desprazamento %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Este non é un arquivo DEB correcto, falta o membro «%s»"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 "Este non é un arquivo DEB correcto, non ten un membro «%s», «%s» ou «%s»"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Non foi posíbel cambiar a %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Produciuse un erro interno, non foi posíbel atopar o membro %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Non foi posíbel atopar un ficheiro de control correcto"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Ficheiro de control non analizábel"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr "Os ficheiros baleiros non poden ser arquivadores válidos"
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Non foi posíbel abrir unha canle para %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Erro de lectura do proceso %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Non foi posíbel determinar o estado"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Non foi posíbel estabelecer a hora de modificación"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Non é posíbel ler a base de datos do CD-ROM %s"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1969,56 +1981,56 @@ msgstr ""
 "Empregue apt-cdrom para que APT poida recoñecer este CD-ROM. Non foi posíbel "
 "empregar apt-get update para engadir un CD-ROM"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "CD-ROM incorrecto"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Non é posíbel desmontar o CD-ROM de %s, pode estarse empregando aínda."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Non se atopou o disco"
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Non se atopou o ficheiro"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI incorrecto, os URI locais non deben comezar por //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Identificándose"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Non é posíbel determinar o nome do outro extremo"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Non é posíbel determinar o nome local"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "O servidor rexeitou a conexión e dixo: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Fallou a orde USER, o servidor dixo: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Fallou a orde PASS, o servidor dixo: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2026,201 +2038,201 @@ msgstr ""
 "Especificouse un servidor proxy pero non un script de conexión, Acquire::"
 "ftp::ProxyLogin está baleiro."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Fallou a orde do script de acceso «%s», o servidor dixo: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Fallou a orde TYPE, o servidor dixo: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Esgotouse o tempo para a conexión"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "O servidor pechou a conexión"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Produciuse un erro de lectura"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Unha resposta desbordou o búfer."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Dano no protocolo"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Produciuse un erro de escritura"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Non é posíbel crear un socket"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Non é posíbel conectar o socket de datos, o tempo esgotouse para a conexión"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Non é posíbel conectar o socket pasivo."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo non puido obter un socket no que atender"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Non é posíbel ligar un socket"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Non é posíbel escoitar no socket"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Non é posíbel determinar o nome do socket"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Non é posíbel enviar a orde PORT"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Familia de enderezos %u (AF_*) descoñecida"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Produciuse un fallou na orde EPRT, o servidor dixo: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "A conexión do socket de datos esgotou o tempo"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Non é posíbel aceptar a conexión"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Xurdiu un problema ao calcular o hash do ficheiro"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Non é posíbel obter o ficheiro, o servidor dixo «%s»"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "O socket de datos esgotou o tempo"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Produciuse un fallou na transferencia de datos, o servidor dixo «%s»"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Petición"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Non é posíbel chamar a "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Conectando a %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, 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:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Non foi posíbel atopar «%s»"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Produciuse un fallo temporal ao buscar «%s»"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Non é posíbel conectar %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Atopouse polo menos unha sinatura incorrecta."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Produciuse un erro descoñecido ao executar gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes sinaturas non eran correctas:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2228,108 +2240,113 @@ msgstr ""
 "Non se puideron verificar as seguintes sinaturas porque a chave pública non "
 "está dispoñíbel:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Agardando polas cabeceiras"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Obtivose unha soa liña de cabeceira en %u caracteres"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Liña de cabeceira incorrecta"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor HTTP enviou unha cabeceira de resposta incorrecta"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 "O servidor HTTP enviou unha cabeceira cunha lonxitude de contido incorrecta"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "O servidor HTTP enviou unha cabeceira cun rango de contido incorrecto"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Este servidor HTTP ten a compatibilidade de rangos estragada"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Formato de datos descoñecido"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Fallou a chamada a select"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "A conexión esgotou o tempo"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Produciuse un erro ao escribir no ficheiro de saída"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Produciuse un erro ao escribir nun ficheiro"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Produciuse un erro ao escribir no ficheiro"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 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:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Produciuse un erro ao ler do servidor"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Non foi posíbel truncar o ficheiro"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Datos da cabeceira incorrectos"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Produciuse un fallo na conexión"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Produciuse un erro interno"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Non é posíbel facer mmap sobre un ficheiro baleiro"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Non foi posíbel duplicar o descritor de ficheiro %i"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Non foi posíbel facer mmap de %lu bytes"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "Non é posíbel pechar mmap"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "Non é posíbel sincronizar mmap"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Non foi posíbel facer mmap de %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Non foi posíbel truncar o ficheiro"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2338,7 +2355,7 @@ msgstr ""
 "Dynamic MMap executouse fora do lugar. Incremente o tamaño de APT::Cache-"
 "Limit. O valor actual é : %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2347,7 +2364,7 @@ msgstr ""
 "Non é posíbel aumentar o tamaño de MMap xa que o límite de %lu bytes xa foi "
 "acadado."
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2378,97 +2395,97 @@ msgstr "%limin %lis"
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Non se atopou a selección %s"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Abreviatura de tipo «%c» descoñecida"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Abrindo o ficheiro de configuración %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Produciuse un erro de sintaxe %s:%u: O bloque comeza sen un nome."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Produciuse un erro de sintaxe %s:%u: Etiqueta mal formada"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Produciuse un erro de sintaxe %s:%u: Lixo extra despois do valor"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Produciuse un erro de sintaxe %s:%u: Só se poden facer directivas no nivel "
 "superior"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Produciuse un erro de sintaxe %s:%u: Includes aniñados de máis"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Produciuse un erro de sintaxe %s:%u: Incluído de aquí"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Produciuse un erro de sintaxe %s:%u: Non se admite a directiva «%s»"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Produciuse un erro de sintaxe %s:%u: a directiva «clear» require unha árbore "
 "de opción como argumento"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Produciuse un erro de sintaxe %s:%u: Lixo extra á fin da liña"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Erro!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Feito"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Non se coñece a opción de liña de ordes «%c» [de %s]."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Non se entende a opción de liña de ordes %s"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "A opción de liña de ordes %s non é booleana"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "A opción %s precisa dun argumento."
@@ -2479,79 +2496,79 @@ msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 "Opción %s: A especificación de elemento de configuración debe ter un =<val>."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "A opción %s precisa dun argumento enteiro, non «%s»"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "A opción «%s» é longa de máis"
 
-#: 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 "O senso %s non se entende, probe «true» ou «false»."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Operación incorrecta: %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Non é posíbel analizar o punto de montaxe %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Non é posíbel cambiar a %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Non foi posíbel analizar o CD-ROM"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, 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:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Non foi posíbel obter o bloqueo %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, 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:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, 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:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, 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:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2559,263 +2576,276 @@ msgstr ""
 "Ignorando o ficheiro «%s» no directorio «%s» xa que ten  unha extensión de "
 "nome incorrecta"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Agardouse por %s pero non estaba alí"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "O subproceso %s recibiu un fallo de segmento."
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "O subproceso %s recibiu o sinal %u."
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, 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:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "O subproceso %s saíu de xeito inesperado"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Non foi posíbel abrir o ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, 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:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Non foi posíbel crear o IPC do subproceso"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Non foi posíbel executar o compresor "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, 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:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, 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:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Produciuse un problema ao pechar o arquivo gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Produciuse un problema ao pechar o ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, 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:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Produciuse un problema ao desligar o ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Produciuse un problema ao sincronizar o ficheiro"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Caché de paquetes baleira"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "O ficheiro de caché de paquetes está danado"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "O ficheiro de caché de paquetes é unha versión incompatíbel"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "O ficheiro de caché de paquetes está danado"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Este APT non admite o sistema de versionado «%s»"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 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:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "PreDepende"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Suxire"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Recomenda"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Conflitos"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Substitúe a"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Fai obsoleto a"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Estraga"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "Mellora"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "requirido"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "estándar"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Construindo a árbore de dependencias"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Versións candidatas"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Xeración de dependencias"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Lendo a información do estado"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Non foi posíbel abrir o ficheiro de estado %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 "Liña %lu mal construída na lista de fontes %s ([opción] non analizábel)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 "Liña %lu mal construída na lista de fontes %s ([opción] demasiado curta)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 "Liña %lu mal construída na lista de fontes %s ([%s] non é unha asignación)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Liña %lu mal construída na lista de fontes %s ([%s] non ten chave)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 "Liña %lu mal construída na lista de fontes %s ([%s] a chave %s non ten valor)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Liña %lu mal construída na lista de orixes %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Liña %lu mal construída na lista de orixes %s (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Liña %lu mal construída na lista de orixes %s (dist absoluta)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Liña %lu mal construída na lista de orixes %s (análise de dist)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 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:281
+#: apt-pkg/sourcelist.cc:285
 #, 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:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2824,7 +2854,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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Non foi posíbel abrir o ficheiro «%s»"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2835,22 +2870,12 @@ msgstr ""
 "por mor dun bucle de Conflitos e Pre-dependencias. Isto adoita ser malo, "
 "pero se o quere facer, active a opción APT::Force-LoopBreak."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"Non foi posíbel realizar a configuración inmediata no paquete, aínda sen "
-"desempaquetar, «%s». Vexa man 5 apt.conf baixo APT::Immediate-Configure para "
-"obter máis detalles."
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "O tipo de ficheiros de índices «%s» non está admitido"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2858,7 +2883,7 @@ msgstr ""
 "O paquete %s ten que ser reinstalado, mais non é posíbel atopar o seu "
 "arquivo."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2866,11 +2891,11 @@ msgstr ""
 "Erro, pkgProblemResolver::Resolve xerou interrupcións, isto pode estar "
 "causado por paquetes retidos."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 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:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2879,210 +2904,172 @@ 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:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Non se atopa a lista de directorios %sparcial."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Non se atopa a lista de arquivos %sparcial."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "Non é posíbel bloquear o directorio %s"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Obtendo o ficheiro %li de %li (restan %s)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Obtendo o ficheiro %li de %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Non foi posíbel atopar o controlador de métodos %s."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "O método %s non se iniciou correctamente"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: 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:163
+#: 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"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Non é posíbel analizar %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Debe introducir algúns URI «orixe» no seu ficheiro sources.list"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Non foi posíbel analizar ou abrir as listas de paquetes ou ficheiro de "
 "estado."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Pode querer executar «apt-get update» para corrixir estes problemas"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Non foi posíbel ler a lista de orixes."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "Rexistro incorrecto no ficheiro de preferencias %s; falta a cabeceira Package"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Non se entendeu o tipo de inmobilización %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 "Non se indicou unha prioridade (ou indicouse cero) para a inmobilización"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "A caché ten un sistema de versionado incompatíbel"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Produciuse un erro ao procesar %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Produciuse un erro ao procesar %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Produciuse un erro ao procesar %s (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Produciuse un erro ao procesar %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Produciuse un erro ao procesar %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Produciuse un erro ao procesar %s (NewVersion%d)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Produciuse un erro ao procesar %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Produciuse un erro ao procesar %s (NewFileDesc2)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Produciuse un erro ao procesar %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Vaites!, superou o número de nomes de paquetes que este APT pode manexar."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Vaites!, superou o número de versións que este APT pode manexar."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Vaites!, superou o número de descricións que este APT pode manexar."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 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:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Produciuse un erro ao procesar %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Produciuse un erro ao procesar %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, 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:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Recollendo as provisións de ficheiros"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "Produciuse un erro de E/S ao gravar a caché de fontes"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "non foi posíbel cambiar o nome, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "A MD5Sum non coincide"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "A sumas «hash» non coinciden"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3091,29 +3078,29 @@ 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, 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:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3124,12 +3111,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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Produciuse un erro de GPG: %s %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3138,7 +3125,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:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3147,7 +3134,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:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3155,41 +3142,41 @@ msgstr ""
 "Os ficheiros de índices de paquetes están danados. Non hai un campo "
 "Filename: para o paquete %s."
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Os tamaños non coinciden"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Non se puido analizar o ficheiro de publicación %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Non hai seccións no ficheiro de publicación %s"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, 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:110
+#: apt-pkg/indexrecords.cc:118
 #, 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:125
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "A entrada «Date» no ficheiro de publicación %s non é válida"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "O bloque de provedor %s non contén unha pegada dixital"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3198,41 +3185,41 @@ msgstr ""
 "Empregando o punto de montaxe de CD-ROMs %s\n"
 "Montando o CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Identificando... "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Etiqueta almacenada: %s\n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "Desmontando o CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Empregando o punto de montaxe de CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Desmontando o CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Agardando polo disco...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Montando o CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Buscando os ficheiros de índices no disco..\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3241,7 +3228,7 @@ msgstr ""
 "Atopáronse %zu índices de paquetes, %zu índices de orixes, %zu índices de "
 "traducións e %zu sinaturas\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3249,16 +3236,16 @@ msgstr ""
 "Non é posíbel localizar ningún ficheiro de paquetes. É posíbel que non sexa "
 "un disco de Debian ou que a arquitectura sexa incorrecta."
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Atopouse a etiqueta «%s»\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Ese non é un nome correcto, volva tentalo.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3267,94 +3254,94 @@ msgstr ""
 "Este disco chámase: \n"
 "«%s»\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Copiando as listas de paquetes..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Escribindo a nova lista de orixes\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "As entradas da lista de orixes deste disco son:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Escribíronse %i rexistros.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, 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:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Escribíronse %i rexistros con %i ficheiros que faltan e %i ficheiros que non "
 "coinciden\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Omitindo o ficheiro inexistente %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Non é posíbel atopar un rexistro de autenticación para: %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Valor de hash non coincidente para: %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "Non ha ningún chaveiro instalado en %s."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Non se atopou a publicación «%s» de «%s»"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Non se atopou a versión «%s» de «%s»"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Non foi posíbel atopar a tarefa «%s»"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Non é posíbel seleccionar distintas versións do paquete «%s» xa que é "
 "puramente virtual"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3363,130 +3350,154 @@ msgstr ""
 "Non é posíbel seleccionar nin a versión instalada nin a candidata do paquete "
 "«%s» xa que non ten ningunha delas"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Non é posíbel seleccionar a versión máis recente do paquete «%s» xa que é "
 "puramente virtual"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Non é posíbel seleccionar a versión candidata do paquete %s xa que non ten "
 "candidata"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Non é posíbel seleccionar a versión instalada do paquete %s xa que non está "
 "instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Retirando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s completamente retirado"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Tomando nota da desaparición de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta o directorio «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Non foi posíbel abrir o ficheiro «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempaquetando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparandose para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "Instalouse %s"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparándose para o retirado de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "Retirouse %s"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparándose para retirar %s completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "Retirouse %s completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "Executando dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas de dependencias - déixase sen configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3494,7 +3505,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:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3502,7 +3513,7 @@ msgstr ""
 "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
 "erro de disco cheo."
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3510,14 +3521,14 @@ 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:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
 "erro de E/S en dpkg"
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3526,7 +3537,7 @@ msgstr ""
 "Non é posíbel bloquear o directorio de administración (%s). Esta usandoo "
 "algún outro proceso?"
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
@@ -3535,37 +3546,37 @@ msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "dpkg interrompeuse, debe executar manualmente «%s» para corrixir o problema. "
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Non está bloqueado"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "Non se atopou ningún ficheiro de replica «%s» "
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Non é posíbel ler o ficheiro de replica «%s»"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Replica: %s]"
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3574,7 +3585,7 @@ msgstr ""
 "Non foi posíbel actualizar %s con mmap e co ficheiro usado na operación - a "
 "actualización semella estar danada."
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3583,10 +3594,69 @@ msgstr ""
 "Non foi posíbel actualizar %s con mmap e (mais non hai un fallo específico "
 "de mmap) - a actualización semella estar danada."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "A conexión pechouse prematuramente"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Nota: Isto será feito automaticamente por dpkg."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "«Override» %s liña %lu incorrecta (1)"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "«Override» %s liña %lu incorrecta (2)"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "«Override» %s liña %lu incorrecta (3)"
+
+#~ msgid "decompressor"
+#~ msgstr "descompresor"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "lectura, aínda hai %lu para ler pero non queda ningún"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "escritura, aínda hai %lu para escribir pero non se puido"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "Non foi posíbel realizar a configuración inmediata no paquete, aínda sen "
+#~ "desempaquetar, «%s». Vexa man 5 apt.conf baixo APT::Immediate-Configure "
+#~ "para obter máis detalles."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Produciuse un erro ao procesar %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Produciuse un erro ao procesar %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Produciuse un erro ao procesar %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Produciuse un erro ao procesar %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Produciuse un erro ao procesar %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Produciuse un erro ao procesar %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Produciuse un erro ao procesar %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Produciuse un erro ao procesar %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Produciuse un erro ao procesar %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Produciuse un erro ao procesar %s (CollectFileProvides)"
+
 #, fuzzy
 #~| msgid "Internal error, could not locate member %s"
 #~ msgid "Internal error, could not locate member"
diff --git a/po/hu.po b/po/hu.po
index a1848959e..9bbfb08ee 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt trunk\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-14 12:59+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+0200\n"
 "PO-Revision-Date: 2012-01-06 22:03+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
@@ -21,150 +21,151 @@ msgstr ""
 "X-Poedit-Country: HUNGARY\n"
 "X-Poedit-Language: Hungarian\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "%s csomag %s verziójának teljesítetlen függősége van:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Csomagnevek összesen : "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Csomagstruktúrák összesen: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Normális csomagok: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Teljesen virtuális csomagok: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Egyedi virtuális csomagok: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Vegyes virtuális csomagok: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Hiányzik: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Különböző verziók összesen: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Összes különböző leírás: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Függőségek összesen: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Verzió/Fájl kapcsolatok összesen: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Leírás/Fájl kapcsolatok összesen: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "„Biztosítja” kapcsolatok összesen: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Minták összesen: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Függőségiverzió-terület összesen: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Slack terület összesen: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Nyilvántartott terület összesen: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "%s csomagfájl nincs szinkronban."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Nem találhatók csomagok"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "Legalább egy keresési mintát meg kell adnia"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 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:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ez a csomag nem található: %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Csomagfájlok:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Rögzített csomagok:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(nem található)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Telepítve: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Jelölt: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(nincs)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Csomagrögzítés: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Verziótáblázat:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3235 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -235,28 +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:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 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:127
+#: cmdline/apt-cdrom.cc:129
 #, 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:162
+#: cmdline/apt-cdrom.cc:164
 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."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Az argumentumok nincsenek párban"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -283,12 +284,12 @@ 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:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s nem egy érvényes DEB csomag."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -313,40 +314,40 @@ 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:267 apt-pkg/pkgcachegen.cc:1164
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nem lehet írni ebbe: %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Nem lehet megállapítani a debconf verziót. A debconf telepítve van?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "A csomagkiterjesztések listája túl hosszú"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Hiba a(z) %s könyvtár feldolgozásakor"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "A forráskiterjesztések listája túl hosszú"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Hiba a tartalomfájl fejlécének írásakor"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Hiba %s tartalmának feldolgozásakor"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -428,26 +429,26 @@ msgstr ""
 "  -c=?  Ezt a konfigurációs fájlt olvassa be\n"
 "  -o=?  Beállít egy tetszőleges konfigurációs opciót"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Nincs illeszkedő kiválasztás"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Néhány fájl hiányzik a(z) „%s” csomagfájlcsoportból"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "A DB megsérült, a fájl átnevezve %s.old-ra"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "A DB régi, kísérlet a következő frissítésére: %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -455,111 +456,111 @@ msgstr ""
 "Az adatbázis-formátum érvénytelen. Ha az apt egy korábbi verziójáról "
 "frissített, akkor távolítsa el, és hozza létre újra az adatbázist."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "A(z) %s DB fájlt nem lehet megnyitni: %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s elérése sikertelen"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Az archívumnak nincs vezérlő rekordja"
 
-#: ftparchive/cachedb.cc:452
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Nem sikerült egy mutatóhoz jutni"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, 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:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "F: %s nem érhető el\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "H: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "F: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "H: Hibás a fájl "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Nem sikerült feloldani ezt: %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Fabejárás nem sikerült"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "%s megnyitása sikertelen"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "readlink nem hajtható végre erre: %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "%s törlése sikertelen"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** %s linkelése sikertelen ehhez: %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " a DeLink korlátja (%sB) elérve.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Az archívumnak nem volt csomag mezője"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s nem rendelkezik felülbíráló bejegyzéssel\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s karbantartója %s, nem %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, 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:717
+#: ftparchive/writer.cc:725
 #, 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"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Nem sikerült memóriát lefoglalni"
 
@@ -569,18 +570,18 @@ msgid "Unable to open %s"
 msgstr "%s megnyitása sikertelen"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Deformált felülbírálás %s %lu. sorában #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Deformált felülbírálás %s %lu. sorában #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Deformált felülbírálás %s %lu. sorában #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -588,63 +589,51 @@ msgstr "Deformált felülbírálás %s %lu. sorában #3"
 msgid "Failed to read the override file %s"
 msgstr "Nem lehet a(z) %s felülbírálófájlt olvasni"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "„%s” tömörítési algoritmus ismeretlen"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "%s tömörített kimenetnek egy tömörítő készletre van szüksége"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Nem sikerült IPC-adatcsatornát létrehozni az alfolyamathoz"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Nem sikerült FILE*-ot létrehozni"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Nem sikerült forkolni"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Gyermekfolyamat tömörítése"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Belső hiba, %s létrehozása sikertelen"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Nem sikerült az alfolyamat IPC-t létrehozni"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Nem sikerült elindítani a tömörítőt "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "kicsomagoló"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "IO az alfolyamathoz/fájlhoz nem sikerült"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Olvasási hiba az MD5 kiszámításakor"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Hiba %s törlésekor"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "„%s” átnevezése sikertelen erre: %s"
@@ -653,75 +642,79 @@ msgstr "„%s” átnevezése sikertelen erre: %s"
 msgid "Y"
 msgstr "I"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr "N"
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex fordítási hiba - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "de %s van telepítve"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "de csak %s telepíthető"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "de az nem telepíthető"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "de az egy virtuális csomag"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "de az nincs telepítve"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "de az nincs telepítésre megjelölve"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " vagy"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Az alábbi ÚJ csomagok lesznek telepítve:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Az alábbi csomagok vissza lesznek tartva:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Az alábbi csomagok frissítve lesznek:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Az alábbi visszafogott csomagokat cserélem:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (%s miatt) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -729,59 +722,59 @@ msgstr ""
 "FIGYELMEZTETÉS: Az alábbi alapvető csomagok el lesznek távolítva.\n"
 "NE tegye ezt, hacsak nem tudja pontosan, mit csinál!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu frissített, %lu újonnan telepített, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu újratelepítendő, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu visszafejlesztendő, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu eltávolítandó és %lu nem frissített.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Megjegyzés: „%s” kijelölése „%s” feladathoz\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Megjegyzés: „%s” kijelölése „%s” regexhez\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "%s egy virtuális csomag, melyet az alábbi csomagok biztosítanak:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Telepítve]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr " [Nem jelölt verzió]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Egyet név szerint ki kell jelölni a telepítésre."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -791,177 +784,177 @@ msgstr ""
 "%s csomag nem elérhető, de egy másik hivatkozik rá.\n"
 "A kért csomag hiányzik, elavult vagy csak más forrásból érhető el\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "De az alábbi csomagok helyettesítik:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "„%s” csomagnak nincs telepítésre jelölt verziója"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "A virtuális csomagokat, mint a(z) „%s” nem lehet eltávolítani\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Megjegyzés: „%s” kijelölése „%s” helyett\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "%s kihagyása, ez már telepítve van, és a frissítés nincs beállítva.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "„%s” kihagyása, nincs telepítve, és csak frissítések lettek kérve.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s már a legújabb verzió.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2096 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s kézi telepítésűre állítva.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "„%s” (%s) verzió lett kijelölve ehhez: „%s”\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "„%s” (%s) verzió lett kijelölve ehhez: „%s”, a(z) „%s” miatt\n"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "A megadott %s csomag nincs telepítve, így nem lett törölve\n"
 
-#: cmdline/apt-get.cc:969
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Függőségek javítása…"
 
-#: cmdline/apt-get.cc:972
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " sikertelen."
 
-#: cmdline/apt-get.cc:975
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Nem lehet javítani a függőségeket"
 
-#: cmdline/apt-get.cc:978
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Kész"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Próbálja futtatni az „apt-get -f install” parancsot ezek javításához."
 
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Teljesítetlen függőségek. Próbálja a -f használatával."
 
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "FIGYELMEZTETÉS: Az alábbi csomagok nem hitelesíthetők!"
 
-#: cmdline/apt-get.cc:1016
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "A hitelesítési figyelmeztetés felülbírálva.\n"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat (i/N)? "
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Néhány csomag nem hitelesíthető"
 
-#: cmdline/apt-get.cc:1034 cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Problémák vannak, és a -y kapcsolót használta --force-yes nélkül"
 
-#: cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!"
 
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Csomagokat kellene eltávolítani, de az eltávolítás nem engedélyezett."
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Belső hiba, a rendezés nem fejeződött be"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "A méretek nem egyeznek, írjon az apt@packages.debian.org címre"
 
 #. 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:1140
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Letöltendő adatmennyisé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:1145
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Letöltendő adatmennyiség: %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:1152
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "A művelet után %sB lemezterület kerül felhasználásra.\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:1157
+#: cmdline/apt-get.cc:1173
 #, c-format
 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:1172 cmdline/apt-get.cc:1175 cmdline/apt-get.cc:2514
-#: cmdline/apt-get.cc:2517
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nem határozható meg a szabad hely mennyisége itt: %s"
 
-#: cmdline/apt-get.cc:1185
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Nincs elég szabad hely itt: %s."
 
-#: cmdline/apt-get.cc:1201 cmdline/apt-get.cc:1221
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "A „Trivial Only” meg van adva, de ez nem egy triviális művelet."
 
-#: cmdline/apt-get.cc:1203
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Igen, tedd amit mondok!"
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -972,28 +965,28 @@ msgstr ""
 "A folytatáshoz írja be ezt a mondatot: „%s”\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1211 cmdline/apt-get.cc:1230
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Megszakítva."
 
-#: cmdline/apt-get.cc:1226
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Folytatni akarja [I/n]? "
 
-#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:2579 apt-pkg/algorithms.cc:1445
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Sikertelen letöltés: %s  %s\n"
 
-#: cmdline/apt-get.cc:1316
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Néhány fájlt nem sikerült letölteni"
 
-#: cmdline/apt-get.cc:1317 cmdline/apt-get.cc:2591
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "A letöltés befejeződött a „csak letöltés” módban"
 
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1001,19 +994,19 @@ msgstr ""
 "Nem lehet letölteni néhány archívumot. Próbálja futtatni az „apt-get update” "
 "parancsot, vagy használja a --fix-missing kapcsolót."
 
-#: cmdline/apt-get.cc:1327
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "A --fix-missing és az adathordozó-csere jelenleg nem támogatott"
 
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Nem lehet javítani a hiányzó csomagokat."
 
-#: cmdline/apt-get.cc:1333
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Telepítés megszakítása."
 
-#: cmdline/apt-get.cc:1361
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1027,38 +1020,38 @@ msgstr[1] ""
 "A következő csomagok eltűntek a rendszerből, mivel\n"
 "az összes fájlt más csomagok fölülírták:"
 
-#: cmdline/apt-get.cc:1365
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Megjegyzés: ezt a dpkg automatikusan és szándékosan hajtja végre."
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 "A(z) „%2$s” csomag el nem érhető „%1$s” cél kiadásának figyelmen kívül "
 "hagyása"
 
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "„%s” kiválasztása forráscsomagként „%s” helyett\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1573
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 "A(z) „%2$s” csomag el nem érhető „%1$s” verziójának figyelmen kívül hagyása"
 
-#: cmdline/apt-get.cc:1589
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Az update parancsnak nincsenek argumentumai"
 
-#: cmdline/apt-get.cc:1652
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nem kellene semmit törölni, az AutoRemover nem indítható"
 
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1076,15 +1069,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1759 cmdline/apt-get.cc:1929
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "Az alábbi információk segíthetnek megoldani a problémát:"
 
-#: cmdline/apt-get.cc:1763
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Belső hiba, az AutoRemover sérült"
 
-#: cmdline/apt-get.cc:1770
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1096,7 +1089,7 @@ msgstr[1] ""
 "A következő csomagok automatikusan lettek telepítve, és már nincs rájuk "
 "szükség:"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1105,20 +1098,20 @@ msgstr[0] "%lu csomag automatikusan lett telepítve, és már nincs rá szüksé
 msgstr[1] ""
 "%lu csomag automatikusan lett telepítve, és már nincs rájuk szükség.\n"
 
-#: cmdline/apt-get.cc:1776
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Ezeket az „apt-get autoremove” paranccsal törölheti."
 
-#: cmdline/apt-get.cc:1795
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Belső hiba, az AllUpgrade megsértett valamit"
 
-#: cmdline/apt-get.cc:1894
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "Próbálja futtatni az „apt-get -f install” parancsot az alábbiak javításához:"
 
-#: cmdline/apt-get.cc:1898
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1126,7 +1119,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:1914
+#: cmdline/apt-get.cc:1929
 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"
@@ -1138,33 +1131,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:1932
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Törött csomagok"
 
-#: cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Az alábbi extra csomagok kerülnek telepítésre:"
 
-#: cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Javasolt csomagok:"
 
-#: cmdline/apt-get.cc:2049
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Ajánlott csomagok:"
 
-#: cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Az alábbi csomag nem található: %s"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s megjelölve automatikusan telepítettként.\n"
 
-#: cmdline/apt-get.cc:2106 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -1172,42 +1165,42 @@ msgstr ""
 "Ez a parancs elavult. Használja helyette az „apt-mark auto” és az „apt-mark "
 "auto” parancsokat."
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Frissítés kiszámítása… "
 
-#: cmdline/apt-get.cc:2125 methods/ftp.cc:708 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Sikertelen"
 
-#: cmdline/apt-get.cc:2130
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Kész"
 
-#: cmdline/apt-get.cc:2197 cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Belső hiba, a problémamegoldó hibát okozott"
 
-#: cmdline/apt-get.cc:2233 cmdline/apt-get.cc:2269
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Nem lehet zárolni a letöltési könyvtárat"
 
-#: cmdline/apt-get.cc:2320
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr "Letöltés: %s %s"
 
-#: cmdline/apt-get.cc:2376
+#: cmdline/apt-get.cc:2396
 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:2416 cmdline/apt-get.cc:2728
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nem található forráscsomag ehhez: %s"
 
-#: cmdline/apt-get.cc:2433
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1217,7 +1210,7 @@ msgstr ""
 "karbantartva:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2438
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1228,70 +1221,70 @@ msgstr ""
 "bzr get %s\n"
 "a csomag legújabb (esetleg kiadatlan) frissítéseinek letöltéséhez.\n"
 
-#: cmdline/apt-get.cc:2491
+#: cmdline/apt-get.cc:2511
 #, 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:2528
+#: cmdline/apt-get.cc:2548
 #, 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:2537
+#: cmdline/apt-get.cc:2557
 #, 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:2542
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Letöltendő forrásadat-mennyiség: %sB.\n"
 
-#: cmdline/apt-get.cc:2548
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Forrás letöltése: %s\n"
 
-#: cmdline/apt-get.cc:2586
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Nem sikerült néhány archívumot letölteni."
 
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2637
 #, 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:2629
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "„%s” kibontási parancs nem sikerült.\n"
 
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2650
 #, 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:2652
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "„%s” elkészítési parancs nem sikerült.\n"
 
-#: cmdline/apt-get.cc:2672
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Hiba a gyermekfolyamatnál"
 
-#: cmdline/apt-get.cc:2691
+#: cmdline/apt-get.cc:2711
 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:2716
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -1300,17 +1293,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:2733
+#: cmdline/apt-get.cc:2753
 #, 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:2753
+#: cmdline/apt-get.cc:2773
 #, 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:2883
+#: cmdline/apt-get.cc:2903
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1319,7 +1312,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:2904
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1328,14 +1321,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:2927
+#: cmdline/apt-get.cc:2947
 #, 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:2966
+#: cmdline/apt-get.cc:2986
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1344,7 +1337,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:2972
+#: cmdline/apt-get.cc:2992
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1353,30 +1346,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:2995
+#: cmdline/apt-get.cc:3015
 #, 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:3011
+#: cmdline/apt-get.cc:3031
 #, 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:3016
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Nem sikerült az építési függőségeket feldolgozni"
 
-#: cmdline/apt-get.cc:3109 cmdline/apt-get.cc:3121
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Változási napló ehhez: %s (%s)"
 
-#: cmdline/apt-get.cc:3240
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Támogatott modulok:"
 
-#: cmdline/apt-get.cc:3281
+#: cmdline/apt-get.cc:3301
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1465,7 +1458,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:3444
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1477,33 +1470,33 @@ msgstr ""
 "      Ne feledje, hogy a zárolás is ki van kapcsolva,\n"
 "      így ne számítson a jelenlegi helyzet valósságára!"
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Találat "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Letöltés:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Mellőz "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Hiba "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Letöltve %sB %s alatt (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Folyamatban]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1514,46 +1507,77 @@ msgstr ""
 " „%s”\n"
 "címkéjű lemezt a(z) %s meghajtóba, és nyomja meg az Entert\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+"Használat: apt-internal-resolver\n"
+"\n"
+"Az apt-internal-resolver felülettel a jelenlegi belső feloldó külső\n"
+"feloldóként használható az APT családhoz hibakeresési vagy hasonló céllal\n"
+"\n"
+"Kapcsolók:\n"
+"   -h  Ez a súgó szöveg.\n"
+"   -q  Naplózható kimenet - nincs folyamatjelző\n"
+"   -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"
+"Lásd még az apt-get(8), sources.list(5) és apt.conf(5) kézikönyvlapokat "
+"további\n"
+"információkért és opciókért.\n"
+"                       Ez az APT a SzuperTehén Hatalmával rendelkezik.\n"
+
+#: cmdline/apt-mark.cc:49
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s nem jelölhető meg, mivel nincs telepítve.\n"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s már be van állítva kézi telepítésűre.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s már meg van jelölve automatikusan telepítettként.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s már be van állítva visszafogásra.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s eddig sem volt visszafogva.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s beállítva visszafogásra.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Visszafogás törölve ezen: %s.\n"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr "A dpkg futtatása sikertelen. Van root jogosultsága?"
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1595,11 +1619,11 @@ msgstr ""
 "Lásd még az apt-mark(8) és apt.conf(5) kézikönyvlapokat további\n"
 "információkért."
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Ismeretlen csomagbejegyzés!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1660,196 +1684,198 @@ msgstr "előtti hibák fontosak. Javítsa azokat, és futtassa az [I]nstallt új
 msgid "Merging available information"
 msgstr "Elérhető információk egyesítése"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Nem sikerült adatcsatornákat létrehozni"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Nem sikerült a gzipet futtatni "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Hibás archívum"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar ellenőrzőösszeg nem egyezik, az archívum megsérült"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Ismeretlen a(z) %u TAR fejléctípus, %s tag"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Érvénytelen archívum-aláírás"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Hiba az archívumtag-fejléc olvasásakor"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "Érvénytelen archívumtag-fejléc: %s"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Érvénytelen archívumtag-fejléc"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Az archívum túl rövid"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Nem sikerült olvasni az archívumfejléceket"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "A DropNode hívása egy még mindig linkelt node-ra történt"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "A hash elem nem található!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Nem lehet eltérítést lefoglalni"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Belső hiba az AddDiversion hívásban"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Kísérlet eltérítés felülírására: %s -> %s és %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "A(z) %s -> %s eltérítés hozzáadásának duplázása"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Dupla %s/%s konfigurációs fájl"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "A(z) %s fájl írása sikertelen"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "A(z) %s fájl bezárása sikertelen"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "A(z) %s útvonal túl hosszú"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "A(z) %s többszöri kicsomagolása"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "A(z) %s könyvtár eltérítve"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Az eltérített útvonal túl hosszú"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 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:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Az útvonal túl hosszú"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, 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:429
+#: apt-inst/extract.cc:432
 #, 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"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:454 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:353
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s nem olvasható"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s nem érhető el"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "%s eltávolítása sikertelen"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "%s létrehozása sikertelen"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "%sinfo nem érhető el"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Az info és temp könyvtáraknak azonos fájlrendszeren kell lenniük"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1063
-#: apt-pkg/pkgcachegen.cc:1167 apt-pkg/pkgcachegen.cc:1173
-#: apt-pkg/pkgcachegen.cc:1335
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Csomaglisták olvasása"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Nem sikerült a(z) %sinfo adminisztrációs könyvtárba váltani"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Belső hiba a csomagnév lekérésekor"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Fájllista olvasása"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1860,113 +1886,114 @@ msgstr ""
 "helyreállítani ezt a fájlt, akkor ürítse ki, és azonnal telepítse újra a "
 "csomag ugyanezen verzióját!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Nem sikerült a(z) %sinfo/%s listafájlt olvasni"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Belső hiba a csomópont lekérésekor"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Nem sikerült a(z) %sdiversions eltérítő fájlt megnyitni"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "Az eltérítő fájl hibás"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Érvénytelen sor az eltérítő fájlban: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Belső hiba egy eltérítés hozzáadásakor"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "A csomaggyorsítótárat kell előbb előkészíteni"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Nem található a csomagfejléc, eltolás: %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Hibás ConfFile szakasz az állapotfájlban. Eltolás: %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "MD5 értelmezési hiba. Eltolás: %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Ez nem egy érvényes DEB archívum, hiányzik a(z) „%s” tag"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 "Érvénytelen DEB archívum, nincs „%s”, „%s” vagy „%s” tagja"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Nem lehet váltani ebbe: %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Belső hiba, %s tag nem található"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Nem található érvényes control fájl"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Értelmezhetetlen control fájl"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr "Az üres fájlok biztosan nem érvényes csomagok"
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Nem lehet adatcsatornát nyitni ehhez: %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Olvasási hiba %s folyamattól"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:527
-#: methods/rred.cc:536
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Nem érhető el"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:533
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "A módosítási idő beállítása sikertelen"
 
-#: methods/cdrom.cc:200
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "%s CD-ROM adatbázis nem olvasható"
 
-#: methods/cdrom.cc:209
+#: 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"
@@ -1974,57 +2001,57 @@ msgstr ""
 "Használja az apt-cdrom parancsot a CD felismertetésére. Az apt-get update "
 "nem használható új CD-k hozzáadására."
 
-#: methods/cdrom.cc:219
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "Hibás CD"
 
-#: methods/cdrom.cc:246
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 "Nem lehet leválasztani az itt lévő CD-ROM-ot: %s, még használatban lehet."
 
-#: methods/cdrom.cc:251
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "A lemez nem található."
 
-#: methods/cdrom.cc:259 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "A fájl nem található"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Érvénytelen URI, helyi URI-k nem kezdődhetnek //-rel"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:169
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Bejelentkezés"
 
-#: methods/ftp.cc:175
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Nem lehet a partner nevét megállapítani"
 
-#: methods/ftp.cc:180
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Nem lehet a helyi nevet megállapítani"
 
-#: methods/ftp.cc:211 methods/ftp.cc:239
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "A kiszolgáló visszautasította a kapcsolatot: %s"
 
-#: methods/ftp.cc:217
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Hibás USER, a kiszolgáló üzenete: %s"
 
-#: methods/ftp.cc:224
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Hibás PASS, a kiszolgáló üzenete: %s"
 
-#: methods/ftp.cc:244
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2032,200 +2059,200 @@ msgstr ""
 "Meg lett adva proxy kiszolgáló, de nincs bejelentkezési parancsfájl és az "
 "Acquire::ftp::ProxyLogin üres."
 
-#: methods/ftp.cc:272
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 "A bejelentkezési parancsfájl „%s” parancsa sikertelen, a kiszolgáló üzenete: "
 "%s"
 
-#: methods/ftp.cc:298
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Hibás TYPE, a kiszolgáló üzenete: %s"
 
-#: methods/ftp.cc:336 methods/ftp.cc:447 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Időtúllépés a kapcsolatban"
 
-#: methods/ftp.cc:342
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "A kiszolgáló lezárta a kapcsolatot"
 
-#: methods/ftp.cc:345 apt-pkg/contrib/fileutl.cc:831 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Olvasási hiba"
 
-#: methods/ftp.cc:352 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "A válasz túlcsordította a puffert."
 
-#: methods/ftp.cc:369 methods/ftp.cc:381
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Protokollhiba"
 
-#: methods/ftp.cc:453 apt-pkg/contrib/fileutl.cc:873 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Írási hiba"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Nem lehet létrehozni a foglalatot"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Nem lehet kapcsolódni az adatfoglalathoz, a kapcsolat túllépte az időkorlátot"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Nem lehet kapcsolódni a passzív foglalathoz."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "A getaddrinfo nem talált figyelőfoglalatot"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Nem lehet összekapcsolódni a foglalattal"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Nem lehet figyelni a foglalaton"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Nem lehet megállapítani a foglalat nevét"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Nem lehet PORT parancsot küldeni"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Ismeretlen címcsalád: %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Hibás EPRT, a kiszolgáló üzenete: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Az adatfoglalathoz kapcsolódás túllépte az időkorlátot"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Nem lehet elfogadni a kapcsolatot"
 
-#: methods/ftp.cc:870 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Probléma a fájl hash értékének meghatározásakor"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nem lehet letölteni a fájlt, a kiszolgáló üzenete: „%s”"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Az adatfoglalat túllépte az időkorlátot"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Az adatátvitel sikertelen, a kiszolgáló üzenete: „%s”"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Lekérdezés"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Nem lehet meghívni "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Csatlakozás: %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Kapcsolat létrehozása sikertelen ehhez: %s: %s (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Kapcsolódás: %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nem lehet feloldani a következőt: „%s”"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Átmeneti hiba „%s” feloldása közben"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, 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:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nem lehet csatlakozni ehhez: %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Legalább egy aláírás érvénytelen."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Ismeretlen gpgv futtatási hiba"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Az alábbi aláírások érvénytelenek voltak:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2233,107 +2260,112 @@ msgstr ""
 "Az alábbi aláírások nem ellenőrizhetők, mert a nyilvános kulcs nem érhető "
 "el:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Várakozás a fejlécekre"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Egyetlen fejlécsor érkezett, amely több, mint %u karakter"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Rossz fejlécsor"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "A HTTP-kiszolgáló érvénytelen válaszfejlécet küldött"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "A HTTP-kiszolgáló érvénytelen Content-Length fejlécet küldött"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "A HTTP-kiszolgáló érvénytelen Content-Range fejlécet küldött"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "A HTTP-kiszolgáló tartománytámogatása sérült"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Ismeretlen dátumformátum"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "A kiválasztás sikertelen"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Időtúllépés a kapcsolatban"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Hiba a kimeneti fájl írásakor"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Hiba a fájl írásakor"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Hiba a fájl írásakor"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 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:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Hiba a kiszolgálóról olvasáskor"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "A fájl csonkítása meghiúsult"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Rossz fejlécadatok"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Sikertelen kapcsolódás"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Belső hiba"
 
 # FIXME
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Nem lehet mmap-olni egy üres fájlt"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Nem lehetett kettőzni a(z) %i fájlleírót"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Nem sikerült %lu bájtot mmap-olni"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "Nem lehet bezárni az mmapot"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "Nem lehet szinkronizálni az mmapot"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Nem sikerült %lu bájtot mmap-olni"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "A fájl csonkítása meghiúsult"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2342,7 +2374,7 @@ msgstr ""
 "A dinamikus MMap helye elfogyott. Növelje az APT::Cache-Limit méretét. A "
 "jelenlegi érték: %lu. (lásd: man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2350,7 +2382,7 @@ msgid ""
 msgstr ""
 "Nem lehet növelni az MMap méretét, mert a(z) %lu bájt korlátot már elérte."
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2381,180 +2413,180 @@ msgstr "%lip %limp"
 msgid "%lis"
 msgstr "%limp"
 
-#: apt-pkg/contrib/strutl.cc:1137
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "%s kiválasztás nem található"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Ismeretlen típusrövidítés: „%c”"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "%s konfigurációs fájl megnyitása"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Szintaktikai hiba %s: %u: A blokk név nélkül kezdődik."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Szintaktikai hiba %s: %u: rosszul formázott címke"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Szintaktikai hiba %s: %u: fölösleges szemét az érték után"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Szintaktikai hiba %s: %u: Csak legfelső szinten használhatók előírások"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Szintaktikai hiba %s: %u: Túl sok beágyazott include"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Szintaktikai hiba %s: %u: ugyaninnen include-olva"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Szintaktikai hiba %s:%u: „%s” nem támogatott előírás"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Szintaktikai hiba %s:%u: a törlési parancs egy beállítási fát vár "
 "argumentumként"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Szintaktikai hiba %s: %u: fölösleges szemét a fájl végén"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s… Hiba!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s… Kész"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "A(z) „%c” parancssori kapcsoló [a következőből: %s] ismeretlen."
 
-#: apt-pkg/contrib/cmndline.cc:101 apt-pkg/contrib/cmndline.cc:109
-#: apt-pkg/contrib/cmndline.cc:117
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "%s parancssori kapcsoló értelmezhetetlen"
 
-#: apt-pkg/contrib/cmndline.cc:122
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "%s parancssori kapcsoló nem logikai"
 
-#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "%s kapcsolóhoz argumentum szükséges."
 
-#: apt-pkg/contrib/cmndline.cc:197 apt-pkg/contrib/cmndline.cc:203
+#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 "%s kapcsoló: a konfigurációs elem megadásához szükséges egy =<érték> rész."
 
-#: apt-pkg/contrib/cmndline.cc:232
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "%s kapcsoló egész, és nem „%s” típusú argumentumot követel meg"
 
-#: apt-pkg/contrib/cmndline.cc:263
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Túl hosszú „%s” kapcsoló"
 
-#: apt-pkg/contrib/cmndline.cc:295
+#: apt-pkg/contrib/cmndline.cc:298
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr "%s jelentés nem értelmezhető, próbálja a true vagy false értékeket."
 
-#: apt-pkg/contrib/cmndline.cc:345
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "%s érvénytelen művelet"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "%s csatolási pont nem érhető el"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:460 apt-pkg/acquire.cc:485 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nem sikerült ide váltani: %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Nem sikerült elérni a CD-ROM-ot."
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "%s zárolási fájl nem nyitható meg"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nem sikerült zárolni: %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, 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:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, 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:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, 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:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2562,269 +2594,281 @@ 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:690
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, 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"
 
-#: apt-pkg/contrib/fileutl.cc:702
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "%s alfolyamat szegmentálási hibát okozott."
 
-#: apt-pkg/contrib/fileutl.cc:704
+#: apt-pkg/contrib/fileutl.cc:733
 #, 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:708
+#: apt-pkg/contrib/fileutl.cc:737
 #, 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:710
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "%s alfolyamat váratlanul kilépett"
 
-#: apt-pkg/contrib/fileutl.cc:775 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nem lehet megnyitni a(z) %s fájlt"
 
-#: apt-pkg/contrib/fileutl.cc:792
+#: apt-pkg/contrib/fileutl.cc:923
 #, 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:852
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Nem sikerült az alfolyamat IPC-t létrehozni"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Nem sikerült elindítani a tömörítőt "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "olvasás, még kellene %lu, de már az összes elfogyott"
 
-#: apt-pkg/contrib/fileutl.cc:885
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "írás, még kiírandó %lu, de ez nem lehetséges"
 
-#: apt-pkg/contrib/fileutl.cc:1021
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Hiba a(z) %s gzip fájl bezárásakor"
 
-#: apt-pkg/contrib/fileutl.cc:1024
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Hiba a(z) %s fájl bezárásakor"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1419
 #, 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:1040
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Hiba a(z) %s fájl törlésekor"
 
-#: apt-pkg/contrib/fileutl.cc:1053
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Hiba a fájl szinkronizálásakor"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Üres csomaggyorsítótár"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "A csomaggyorsítótár fájl megsérült"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "A csomaggyorsítótár-fájl inkompatibilis verziójú"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+msgid "The package cache file is corrupted, it is too small"
+msgstr "A csomaggyorsítótár-fájl sérült, túl kicsi"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Ez az APT nem támogatja a(z) „%s” verziórendszert"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 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:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Függ ettől"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Függ ettől (előfüggés)"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Javasolja"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Ajánlja"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Ütközik"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Kicseréli"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Elavulttá teszi"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Töri"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "Bővíti"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "fontos"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "szükséges"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "szabványos"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "opcionális"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Függőségi fa építése"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Lehetséges verziók"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Függőséggenerálás"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Állapotinformációk olvasása"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "%s állapotfájl megnyitása sikertelen"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "%s átmeneti állapotfájl írása sikertelen"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] "
 "feldolgozhatatlan)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] túl "
 "rövid)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem "
 "érvényes hozzárendelés)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem "
 "tartalmaz kulcsot)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 "Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] %s kulcsnak "
 "nincs értéke)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (Abszolút dist)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist feldolgozás)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "%s megnyitása"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 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:281
+#: apt-pkg/sourcelist.cc:285
 #, 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:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:645
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2833,7 +2877,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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "A(z) „%s” fájl megnyitása sikertelen"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2844,29 +2893,19 @@ msgstr ""
 "eltávolítását, ami ütközési/előfüggőségi hurkot okoz. Ez gyakran rossz, de "
 "ha tényleg ezt akarja tenni, aktiválja az APT::Force-LoopBreak opciót."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"Nem lehetett a már kicsomagolt „%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."
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "A(z) „%s” indexfájltípus nem támogatott"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 "A(z) %s csomagot újra kell telepíteni, de nem található hozzá archívum."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2874,11 +2913,11 @@ msgstr ""
 "Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott "
 "csomagok okozhatják."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 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:1471 apt-pkg/algorithms.cc:1473
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2886,83 +2925,83 @@ 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:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "A(z) %spartial listakönyvtár hiányzik."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "A(z) %spartial archívumkönyvtár hiányzik."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "%s könyvtár zárolása sikertelen"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:861
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "%li/%li fájl letöltése (%s marad)"
 
-#: apt-pkg/acquire.cc:863
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "%li/%li fájl letöltése"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "A(z) %s metódusvezérlő nem található."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "A(z) %s metódus nem indult el megfelelően"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:146
+#: 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:162
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "A megfelelő csomagrendszertípus nem határozható meg"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "%s nem érhető el."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Néhány „source” URI-t el kell helyezni a sources.list fájlban"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "A csomaglisták vagy az állapotfájl nem dolgozhatók fel vagy nem nyithatók "
 "meg."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Próbálja futtatni az „apt-get update” parancsot ezen hibák javításához"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "A források listája olvashatatlan."
 
-#: apt-pkg/policy.cc:72
+#: apt-pkg/policy.cc:74
 #, c-format
 msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
@@ -2971,127 +3010,89 @@ msgstr ""
 "A(z) „%s” érték érvénytelen az APT::Default-Release beállításhoz, mert nincs "
 "ilyen kiadás a forrásokban"
 
-#: apt-pkg/policy.cc:390
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Érvénytelen rekord a(z) %s beállításfájlban, nincs Package fejléc"
 
-#: apt-pkg/policy.cc:412
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "A(z) %s rögzítéstípus nem értelmezhető"
 
-#: apt-pkg/policy.cc:420
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Nincs prioritás (vagy nulla) megadva a rögzítéshez"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "A gyorsítótárnak inkompatibilis verziórendszere van"
 
-#: apt-pkg/pkgcachegen.cc:190
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Hiba történt %s feldolgozásakor (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:207
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Hiba történt %s feldolgozásakor (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:245
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Hiba történt %s feldolgozásakor (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:277
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
 #, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Hiba történt %s feldolgozásakor (UsePackage2)"
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Hiba történt a(z) %s feldolgozása során (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:281
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Hiba történt %s feldolgozásakor (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:298 apt-pkg/pkgcachegen.cc:308
-#: apt-pkg/pkgcachegen.cc:316
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Hiba történt a(z) %s (NewVersion%d) feldolgozása során"
-
-#: apt-pkg/pkgcachegen.cc:312
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Hiba történt %s feldolgozásakor (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:345
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Hiba történt %s feldolgozásakor (NewFileDesc2)"
-
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Az APT által kezelhető csomagnevek száma túllépve."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Az APT által kezelhető csomagverziók száma túllépve."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Az APT által kezelhető csomagleírások száma túllépve."
 
-#: apt-pkg/pkgcachegen.cc:360
+#: apt-pkg/pkgcachegen.cc:243
 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:389
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Hiba történt %s feldolgozásakor (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:403
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Hiba történt %s feldolgozásakor (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:975
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni"
 
 # FIXME
-#: apt-pkg/pkgcachegen.cc:1080
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "„Biztosítja” kapcsolatok összegyűjtése"
 
-#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1281
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "IO hiba a forrás-gyorsítótár mentésekor"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "sikertelen átnevezés, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "Az MD5Sum nem megfelelő"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1847
-#: apt-pkg/acquire-item.cc:1990
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "A Hash Sum nem megfelelő"
 
-#: apt-pkg/acquire-item.cc:1387
+#: apt-pkg/acquire-item.cc:1399
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3100,16 +3101,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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1438
+#: apt-pkg/acquire-item.cc:1450
 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:1476
+#: apt-pkg/acquire-item.cc:1488
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3118,12 +3119,12 @@ 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:1498
+#: apt-pkg/acquire-item.cc:1510
 #, 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:1531
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3133,12 +3134,12 @@ msgstr ""
 "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:1541 apt-pkg/acquire-item.cc:1546
+#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG hiba: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1638
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3147,7 +3148,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:1697
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3156,48 +3157,48 @@ 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:1752
+#: apt-pkg/acquire-item.cc:1768
 #, 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:1839
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "A méret nem megfelelő"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "A(z) %s Release fájl nem dolgozható fel"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "A(z) %s Release fájl nem tartalmaz szakaszokat"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, 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:110
+#: apt-pkg/indexrecords.cc:118
 #, 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:129
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Érvénytelen „Date” bejegyzés a(z) %s Release fájlban"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "A(z) %s terjesztőblokk nem tartalmaz ujjlenyomatot"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3206,41 +3207,41 @@ msgstr ""
 "%s CD-ROM csatolási pont használata\n"
 "CD-ROM csatolása\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Azonosítás… "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Tárolt címke: %s\n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "CD-ROM leválasztása…\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "%s CD-ROM csatolási pont használata\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "CD-ROM leválasztása\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Várakozás a lemezre…\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "CD-ROM csatolása…\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Indexfájlok keresése a lemezen…\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3249,7 +3250,7 @@ msgstr ""
 "%zu csomagindex, %zu forrásindex, %zu fordításindex és %zu aláírás "
 "megtalálva\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3257,16 +3258,16 @@ msgstr ""
 "Nem találhatók csomagfájlok, lehet hogy ez nem Debian lemez, vagy nem "
 "megfelelő az architektúra?"
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Talált címke: „%s”\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "A név érvénytelen, próbálja újra.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3275,90 +3276,90 @@ msgstr ""
 "A lemez neve: \n"
 "„%s”\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Csomaglisták másolása…"
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Új forráslista írása\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 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:270 apt-pkg/indexcopy.cc:927
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i rekord kiírva.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:929
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, 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:275 apt-pkg/indexcopy.cc:932
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:935
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, 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"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "A nem létező %s fájl kihagyása"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "%s hitelesítési rekordja nem található"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "%s ellenőrzőösszege nem megfelelő"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "Nincs kulcstartó telepítve ide: %s."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "„%s” kiadás nem található ehhez: „%s”"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "„%s” verzió nem található ehhez: „%s”"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "„%s” feladat nem található"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "„%s” csomagból nem választható verzió, mert teljesen virtuális"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3367,124 +3368,148 @@ msgstr ""
 "„%s” csomagból nem választható sem telepített, sem kiadásra jelölt verzió, "
 "mert egyikkel sem rendelkezik"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "„%s” csomag legújabb verziója nem választható ki, mert teljesen virtuális"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "„%s” csomag kiadásra jelölt verziója nem választható ki, mert nincs jelöltje"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "„%s” csomag telepített verziója nem választható ki, mert nincs telepítve"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr "A helyzet elküldése a solvernek"
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr "Kérés küldése a solvernek"
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr "Felkészülés megoldás fogadására"
+
+#: apt-pkg/edsp.cc:288
+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:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr "Külső solver végrehajtása"
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "%s telepítése"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "%s konfigurálása"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "%s eltávolítása"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s teljes eltávolítása"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "„%s” eltűnése feljegyezve"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "A(z) „%s” könyvtár hiányzik"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "A(z) „%s” fájl megnyitása sikertelen"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "%s előkészítése"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s kicsomagolása"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s konfigurálásának előkészítése"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "%s telepítve"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, 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:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "%s eltávolítva"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, 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:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s teljesen eltávolítva"
 
-#: apt-pkg/deb/dpkgpm.cc:1087
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1118
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "A dpkg futtatása"
 
-#: apt-pkg/deb/dpkgpm.cc:1344
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1349
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "függőségi hibák - a csomag beállítatlan maradt"
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3492,7 +3517,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:1357
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3500,7 +3525,7 @@ msgstr ""
 "Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint megtelt a "
 "lemez"
 
-#: apt-pkg/deb/dpkgpm.cc:1363
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3508,13 +3533,13 @@ 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:1370
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Nem került kiírásra apport jelentés, mert a hibaüzenet dpkg I/O hibát jelez"
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3523,7 +3548,7 @@ msgstr ""
 "Az adminisztrációs könyvtár (%s) nem zárolható, lehet hogy másik folyamat "
 "használja?"
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
@@ -3531,7 +3556,7 @@ msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3539,30 +3564,30 @@ msgstr ""
 "A dpkg megszakadt, saját kezűleg kell futtatnia a(z) „%s” parancsot a "
 "probléma megoldásához. "
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Nincs zárolva"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "Nem található a(z) „%s” tükörfájl "
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "A(z) „%s” tükörfájl nem olvasható"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Tükör: %s]"
 
-#: methods/rred.cc:506
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3571,7 +3596,7 @@ msgstr ""
 "%s nem foltozható mmappel és fájlművelet használatával - a folt sérültnek "
 "tűnik."
 
-#: methods/rred.cc:511
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3580,64 +3605,68 @@ msgstr ""
 "%s nem foltozható mmappel (nem mmap specifikus hiba) - a folt sérültnek "
 "tűnik."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "A kapcsolat idő előtt lezárult"
 
-#~ msgid "N"
-#~ msgstr "N"
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Megjegyzés: ezt a dpkg automatikusan és szándékosan hajtja végre."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Deformált felülbírálás %s %lu. sorában #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Deformált felülbírálás %s %lu. sorában #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Deformált felülbírálás %s %lu. sorában #3"
+
+#~ msgid "decompressor"
+#~ msgstr "kicsomagoló"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "olvasás, még kellene %lu, de már az összes elfogyott"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "írás, még kiírandó %lu, de ez nem lehetséges"
 
 #~ msgid ""
-#~ "Usage: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver 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"
-#~ "apt.conf(5) manual pages for more information and options.\n"
-#~ "                       This APT has Super Cow Powers.\n"
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "Használat: apt-internal-resolver\n"
-#~ "\n"
-#~ "Az apt-internal-resolver felülettel a jelenlegi belső feloldó külső\n"
-#~ "feloldóként használható az APT családhoz hibakeresési vagy hasonló "
-#~ "céllal\n"
-#~ "\n"
-#~ "Kapcsolók:\n"
-#~ "   -h  Ez a súgó szöveg.\n"
-#~ "   -q  Naplózható kimenet - nincs folyamatjelző\n"
-#~ "   -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"
-#~ "Lásd még az apt-get(8), sources.list(5) és apt.conf(5) kézikönyvlapokat "
-#~ "további\n"
-#~ "információkért és opciókért.\n"
-#~ "                       Ez az APT a SzuperTehén Hatalmával rendelkezik.\n"
-
-#~ msgid "The package cache file is corrupted, it is too small"
-#~ msgstr "A csomaggyorsítótár-fájl sérült, túl kicsi"
-
-#~ msgid "Error occurred while processing %s (%s%d)"
-#~ msgstr "Hiba történt a(z) %s feldolgozása során (%s%d)"
-
-#~ msgid "Send scenario to solver"
-#~ msgstr "A helyzet elküldése a solvernek"
-
-#~ msgid "Send request to solver"
-#~ msgstr "Kérés küldése a solvernek"
-
-#~ msgid "Prepare for receiving solution"
-#~ 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"
-
-#~ msgid "Execute external solver"
-#~ msgstr "Külső solver végrehajtása"
+#~ "Nem lehetett a már kicsomagolt „%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."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Hiba történt %s feldolgozásakor (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Hiba történt %s feldolgozásakor (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Hiba történt %s feldolgozásakor (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Hiba történt %s feldolgozásakor (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Hiba történt %s feldolgozásakor (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Hiba történt a(z) %s (NewVersion%d) feldolgozása során"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Hiba történt %s feldolgozásakor (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Hiba történt %s feldolgozásakor (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Hiba történt %s feldolgozásakor (FindPkg)"
+
+#~ 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 "
diff --git a/po/it.po b/po/it.po
index 60646a280..d92babfdb 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+0200\n"
 "PO-Revision-Date: 2011-05-16 21:38+0200\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -20,150 +20,151 @@ msgstr ""
 "X-Launchpad-Export-Date: 2011-02-21 18:00+0000\n"
 "X-Generator: Launchpad (build 12406)\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Il pacchetto %s versione %s ha una dipendenza non soddisfatta:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Totale nomi dei pacchetti: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Totale strutture dei pacchetti: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Pacchetti normali: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Pacchetti virtuali puri: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Pacchetti virtuali singoli: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Pacchetti virtuali misti: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Mancante: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Totale versioni distinte: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Totale descrizioni distinte: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Totale dipendenze: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Totale relazioni ver/file: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Totale relazioni desc/file: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Totale corrispondenze fornite: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Totale stringhe globalizzate: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Totale spazio dipendenza di versione: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Totale spazio inutilizzato: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Totale spazio occupato: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Il file dei pacchetti %s non è sincronizzato."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Nessun pacchetto trovato"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "È necessario specificare almeno un modello per la ricerca"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Impossibile trovare il pacchetto %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "File dei pacchetti:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Pacchetti con gancio:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(non trovato)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Installato: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(nessuno)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Gancio del pacchetto: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Tabella versione:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -238,28 +239,28 @@ msgstr ""
 "Per maggiori informazioni, consultare le pagine di manuale apt-cache(8) e "
 "apt.conf(5).\n"
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Inserire un disco nell'unità e premere Invio"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Mount di \"%s\" su \"%s\" non riuscito"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Ripetere questo processo per il resto dei CD."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Argomenti non in coppia"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -287,12 +288,12 @@ 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:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s non è un pacchetto DEB valido."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -316,40 +317,40 @@ 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:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Impossibile scrivere in %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Impossibile trovare la versione di debconf. È installato?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "L'elenco dell'estensione del pacchetto è troppo lungo"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Errore nell'elaborare la directory %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "L'elenco dell'estensione del sorgente è troppo lungo"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Errore nella scrittura dell'intestazione nel file \"contents\""
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Errore nell'elaborare i contenuti %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -430,26 +431,26 @@ msgstr ""
 "  -c=?        Legge come configurazione il file specificato\n"
 "  -o=?        Imposta un'opzione arbitraria di configurazione"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Nessuna selezione corrisponde"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Mancano alcuni file nel file group di pacchetti \"%s\""
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "Il database era danneggiato, il file è stato rinominato in %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "Il database è vecchio, tentativo di aggiornamento %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -457,114 +458,114 @@ msgstr ""
 "Il formato del database non è valido. Se è stato eseguito l'aggiornamento da "
 "una vecchia versione di apt, rimuovere e ricreare il database."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Impossibile aprire il file del database %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Impossibile eseguire stat su %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "L'archivio non ha un campo \"control\""
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 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:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A: Impossibile leggere la directory %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "A: Impossibile eseguire stat su %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "A: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: Gli errori si applicano al file "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Risoluzione di %s non riuscita"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Visita dell'albero non riuscita"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Apertura di %s non riuscita"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " Delink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Esecuzione di readlink su %s non riuscita"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Esecuzione di unlink su %s non riuscita"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Collegamento di %s a %s non riuscito"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Raggiunto il limite di DeLink di %sB.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "L'archivio non ha un campo \"package\""
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s non ha un campo override\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  il responsabile di %s è %s non %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s non ha un campo source override\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s non ha neppure un campo binario override\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Allocazione della memoria non riuscita"
 
@@ -574,18 +575,18 @@ msgid "Unable to open %s"
 msgstr "Impossibile aprire %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Override non corretto: file %s riga %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Override non corretto: file %s riga %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Override non corretto: file %s riga %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -593,63 +594,51 @@ msgstr "Override non corretto: file %s riga %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "Lettura del file override %s non riuscita"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Algoritmo di compressione \"%s\" sconosciuto"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "L'output compresso %s necessita di un insieme di compressione"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Creazione di una pipe IPC verso il sottoprocesso non riuscita"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Creazione di FILE* non riuscita"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Fork non riuscita"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Sottoprocesso compresso"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Errore interno, creazione di %s non riuscita"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Creazione di un sottoprocesso IPC non riuscita"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Esecuzione non riuscita del compressore "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "de-compressore"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "I/O al sottoprocesso/file non riuscito"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Lettura durante l'elaborazione MD5 non riuscita"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Problema nell'unlink di %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Rinomina di %s in %s non riuscita"
@@ -658,75 +647,79 @@ msgstr "Rinomina di %s in %s non riuscita"
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Errore di compilazione dell'espressione regolare - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "ma la versione %s è installata"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ma la versione %s sta per essere installata"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "ma non è installabile"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "ma è un pacchetto virtuale"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "ma non è installato"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "ma non sta per essere installato"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " oppure"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "I seguenti pacchetti NUOVI saranno installati:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "I seguenti pacchetti saranno RIMOSSI:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "I seguenti pacchetti saranno aggiornati:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "I seguenti pacchetti saranno RETROCESSI:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "I seguenti pacchetti bloccati saranno cambiati:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (a causa di %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -735,59 +728,59 @@ msgstr ""
 "Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa "
 "si sta facendo."
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu aggiornati, %lu installati, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstallati, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu retrocessi, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu da rimuovere e %lu non aggiornati.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu non completamente installati o rimossi.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Nota, viene selezionato \"%s\" per il task \"%s\"\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Nota, viene selezionato \"%s\" per l'espressione regolare \"%s\"\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Il pacchetto %s è un pacchetto virtuale fornito da:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Installato]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr " [Versione non candidata]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "È necessario sceglierne uno da installare."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -798,186 +791,186 @@ msgstr ""
 "pacchetto. Questo può significare che il pacchetto è mancante, è obsoleto\n"
 "oppure è disponibile solo all'interno di un'altra sorgente\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Tuttavia questi pacchetti lo sostituiscono:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Il pacchetto \"%s\" non ha candidati da installare"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "Pacchetti virtuali come \"%s\" non possono essere rimossi\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Nota, viene selezionato \"%s\" al posto di \"%s\"\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Viene saltato %s poiché è già installato e l'aggiornamento non è impostato.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Viene saltato %s poiché non è installato e sono richiesti solo gli "
 "aggiornamenti.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "La reinstallazione di %s non è possibile, non può essere scaricato.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s è già alla versione più recente.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "È stato impostato %s per l'installazione manuale.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versione \"%s\" (%s) selezionata per \"%s\"\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Versione \"%s\" (%s) selezionata per \"%s\" per via di \"%s\"\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Il pacchetto %s non è installato e quindi non è stato rimosso\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Correzione delle dipendenze..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " non riuscita."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Impossibile correggere le dipendenze"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Impossibile minimizzare l'insieme da aggiornare"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Fatto"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "È utile eseguire \"apt-get -f install\" per correggere ciò."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dipendenze non trovate. Riprovare usando -f."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati."
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Avviso di autenticazione disabilitato.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Installare questi pacchetti senza verificarli [s/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Alcuni pacchetti non possono essere autenticati"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Si sono verificati dei problemi ed è stata usata -y senza --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "Errore interno, InstallPackages è stato chiamato con un pacchetto "
 "danneggiato."
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "I pacchetti devono essere rimossi, ma l'azione di rimozione è disabilitata."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Errore interno, l'ordinamento non è stato terminato"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Le dimensioni non corrispondono. Inviare un'email a: apt@packages.debian.org"
 
 #. 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "È necessario scaricare %sB/%sB di archivi.\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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "È necessario scaricare %sB di archivi.\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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Dopo quest'operazione, verranno occupati %sB di spazio su disco.\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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 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:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Impossibile determinare lo spazio libero in %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Spazio libero in %s insufficiente."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "È stata specificata la modalità \"Trivial Only\", ma questa non è "
 "un'operazione banale."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Sì, esegui come da richiesta."
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -988,28 +981,28 @@ msgstr ""
 "Per continuare scrivere la frase \"%s\"\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Interrotto."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Continuare [S/n]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Impossibile recuperare %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Scaricamento di alcuni file non riuscito"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Scaricamento completato e in modalità solo scaricamento"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1017,19 +1010,19 @@ msgstr ""
 "Impossibile scaricare alcuni pacchetti. Potrebbe essere utile eseguire \"apt-"
 "get update\" o provare l'opzione \"--fix-missing\"."
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing su supporti estraibili non è ancora supportato"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Impossibile correggere i pacchetti mancanti."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Interruzione dell'installazione."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1043,36 +1036,36 @@ msgstr[1] ""
 "I seguenti pacchetti sono spariti dal sistema poiché\n"
 "tutti i file sono stati sovrascritti da altri pacchetti:"
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Nota: questo viene svolto automaticamente da dpkg."
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Ignorato il rilascio non disponibile \"%s\" del pacchetto \"%s\""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Scelto \"%s\" come pacchetto sorgente al posto di \"%s\"\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Ignorata la versione \"%s\" non disponibile del pacchetto \"%s\""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Il comando update non accetta argomenti"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Non si è autorizzati a rimuovere nulla, impossibile avviare AutoRemover"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1090,15 +1083,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Errore interno, AutoRemover ha rovinato qualche cosa"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1111,7 +1104,7 @@ msgstr[1] ""
 "I seguenti pacchetti sono stati installati automaticamente e non sono più "
 "richiesti:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1122,20 +1115,20 @@ msgstr[1] ""
 "%lu pacchetti sono stati installati automaticamente e non sono più "
 "richiesti.\n"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Usare \"apt-get autoremove\" per rimuoverli."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Errore interno, AllUpgrade ha rovinato qualche cosa"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "È utile eseguire \"apt-get -f install\" per correggere questi problemi:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1143,7 +1136,7 @@ msgstr ""
 "Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti "
 "(o specificare una soluzione)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1155,74 +1148,74 @@ 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:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Pacchetti danneggiati"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "I seguenti pacchetti saranno inoltre installati:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Pacchetti suggeriti:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Pacchetti raccomandati:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossibile trovare il pacchetto %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s impostato automaticamente come installato.\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Calcolo dell'aggiornamento... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Non riuscito"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Eseguito"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Impossibile bloccare la directory di scaricamento"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr "Scaricamento di %s %s"
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 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:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossibile trovare un pacchetto sorgente per %s"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1232,7 +1225,7 @@ msgstr ""
 "all'interno del sistema di controllo della versione \"%s\" presso:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1244,87 +1237,87 @@ msgstr ""
 "per recuperare gli ultimi (e probabilmente non rilasciati) aggiornamenti del "
 "pacchetto.\n"
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "È necessario scaricare %sB di sorgenti.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Recupero sorgente %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Recupero di alcuni archivi non riuscito."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comando di estrazione \"%s\" non riuscito.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, 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:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comando \"%s\" di generazione non riuscito.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Creazione processo figlio non riuscita"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 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:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, 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:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s non ha dipendenze di generazione.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1333,7 +1326,7 @@ msgstr ""
 "%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s "
 "non può essere trovato"
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1342,14 +1335,14 @@ msgstr ""
 "%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s "
 "non può essere trovato"
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1358,7 +1351,7 @@ msgstr ""
 "%s dipendenze per %s non possono essere soddisfatte perché nessuna versione "
 "del pacchetto %s può soddisfare le richieste di versione"
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1367,30 +1360,30 @@ msgstr ""
 "%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s "
 "non può essere trovato"
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, 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:2996
+#: cmdline/apt-get.cc:3031
 #, 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:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Elaborazione delle dipendenze di generazione non riuscita"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changelog per %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Moduli supportati:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1483,7 +1476,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:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1495,34 +1488,34 @@ msgstr ""
 "      Inoltre, il meccanismo di blocco non è attivato e non è quindi\n"
 "      utile dare importanza a tutto ciò per una situazione reale."
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Trovato "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Scaricamento di:"
 
 # (ndt) questa non so cosa voglia dire
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ign "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Err "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Recuperati %sB in %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [In lavorazione]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1533,46 +1526,62 @@ msgstr ""
 " \"%s\"\n"
 "nell'unità \"%s\" e premere Invio\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "ma non è installato"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "È stato impostato %s per l'installazione manuale.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s impostato automaticamente come installato.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s è già alla versione più recente.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s è già alla versione più recente.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "È stato impostato %s per l'installazione manuale.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Apertura di %s non riuscita"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1594,11 +1603,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Record del pacchetto sconosciuto."
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1663,197 +1672,199 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Unione delle informazioni disponibili"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Creazione delle pipe non riuscita"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Esecuzione di gzip non riuscita"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Archivio danneggiato"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Checksum di tar non riuscito, archivio danneggiato"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Intestazione TAR di tipo %u sconosciuta, member %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Firma dell'archivio non valida"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Errore nel leggere l'intestazione member dell'archivio"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "Intestazione member dell'archivio %s non valida"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Intestazione member dell'archivio non valida"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "L'archivio è troppo piccolo"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Lettura delle intestazioni dell'archivio non riuscita"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "DropNode invocata su un nodo ancora collegato"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Localizzazione dell'elemento hash non riuscita."
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Allocazione della deviazione non riuscita"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Errore interno in AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Tentativo di sovrascrivere una deviazione, %s -> %s e %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Doppia aggiunta di deviazione %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "File di configurazione duplicato %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Scrittura del file %s non riuscita"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Chiusura del file %s non riuscita"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Il percorso %s è troppo lungo"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Estrazione di %s eseguita più di una volta"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "La directory %s è deviata"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Il percorso della deviazione è troppo lungo"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "Localizzazione del nodo nel suo hash bucket non riuscita"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Il percorso è troppo lungo"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Il pacchetto sovrascritto corrisponde senza versione per %s"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossibile leggere %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Impossibile eseguire stat su %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Rimozione di %s non riuscita"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Impossibile creare %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Esecuzione di stat su %sinfo non riuscita"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Le directory temp e info devono essere sullo stesso file system"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Lettura elenco dei pacchetti"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Cambio della directory admin %sinfo non riuscito"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Errore interno nel recuperare un nome di un pacchetto"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Lettura elenco dei file"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1864,114 +1875,115 @@ msgstr ""
 "ripristinarlo, crearne uno vuoto e reinstallare immediatamente la stessa "
 "versione del pacchetto."
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Lettura del file dell'elenco %sinfo/%s non riuscita"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Errore interno nel recuperare un nodo"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Apertura del file di deviazione %sdiversions non riuscita"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "Il file di deviazione è danneggiato"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Riga non valida nel file di diversion: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Errore interno nell'aggiungere una deviazioni"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "La cache dei pacchetti deve prima essere inizializzata"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Impossibile trovare un Package: header, offset %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Sezione ConfFile nel file di stato non corretta. Offset %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Errore nell'analisi MD5. Offset %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Questo non è un archivio DEB valido: membro \"%s\" mancante"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 "Questo non è un archivio DEB valido: membri \"%s\", \"%s\" o \"%s\" mancanti"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Impossibile passare a %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Errore interno, impossibile trovare il membro %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Impossibile localizzare un file \"control\" valido"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "File \"control\" non analizzabile"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr "File vuoti non possono essere archivi validi"
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Impossibile aprire una pipe per %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Errore di lettura dal processo %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Esecuzione di stat non riuscita"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Impostazione della data di modifica non riuscita"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Impossibile leggere il database del CD-ROM %s"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1979,56 +1991,56 @@ msgstr ""
 "Usare apt-cdrom per far riconoscere questo CD-ROM da APT. apt-get update non "
 "può essere usato per aggiungere nuovi CD-ROM"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "CD-ROM sbagliato"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Impossibile smontare il CD-ROM in %s, potrebbe essere ancora in uso."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Disco non trovato"
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "File non trovato"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI non valido, gli URI locali non devono iniziare con //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Accesso in corso"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Impossibile determinare il nome del nodo"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Impossibile determinare il nome locale"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Il server ha rifiutato la connessione e riporta: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER non riuscito, il server riporta: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS non riuscito, il server riporta: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2036,203 +2048,203 @@ msgstr ""
 "È stato specificato un server proxy, ma nessuno script di accesso: Acquire::"
 "ftp::ProxyLogin è vuoto."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 "Comando dello script di accesso \"%s\" non riuscito, il server riporta: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE non riuscito, il server riporta: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Connessione scaduta"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Il server ha chiuso la connessione"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Errore di lettura"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Una risposta ha superato le dimensioni del buffer."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Protocollo danneggiato"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Errore di scrittura"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Impossibile creare un socket"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Impossibile connettersi al socket dati, tempo esaurito per la connessione"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Impossibile connettersi alla socket passiva."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Impossibile ottenere un socket in ascolto con getaddrinfo()"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Impossibile eseguire bind() su un socket"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Impossibile eseguire listen() su un socket"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Impossibile determinare il nome del socket"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Impossibile inviare il comando PORT"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Famiglia di indirizzamento %u (AF_*) sconosciuta"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT non riuscito, il server riporta: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Connessione al socket dati terminata"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Impossibile accettare connessioni"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Si è verificato un problema nel creare l'hash del file"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Impossibile recuperare il file, il server riporta: \"%s\""
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Socket dati terminato"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Trasferimento dati non riuscito, il server riporta: \"%s\""
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Interrogazione"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Impossibile invocare "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Connessione a %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Impossibile iniziare la connessione a %s:%s (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Connessione a %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Impossibile risolvere \"%s\""
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Risoluzione di \"%s\" temporaneamente non riuscita"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, 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:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Impossibile connettersi a %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "È stata trovata almeno una firma non valida."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Errore sconosciuto durante l'esecuzione di gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Le seguenti firme non erano valide:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2240,106 +2252,111 @@ msgstr ""
 "Le seguenti firme non sono state verificate perché la chiave pubblica non è "
 "disponibile:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "In attesa degli header"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Ricevuta una singola riga header su %u caratteri"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Riga header non corretta"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Il server HTTP ha inviato un header di risposta non valido"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Il server HTTP ha inviato un header Content-Length non valido"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Il server HTTP ha inviato un header Content-Range non valido"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Questo server HTTP ha un supporto del range non corretto"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Formato della data sconosciuto"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Select non riuscita"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Connessione terminata"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Errore nello scrivere sul file di output"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Errore nello scrivere su file"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Errore nello scrivere sul file"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 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:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Errore nel leggere dal server"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Troncamento del file non riuscito"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Header dati non corretto"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Connessione non riuscita"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Errore interno"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Impossibile eseguire mmap su un file vuoto"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Impossibile duplicare il descrittore del file %i"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Impossibile eseguire mmap di %lu byte"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "Impossibile chiudere mmap"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "Impossibile sincronizzare mmap"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Impossibile eseguire mmap di %lu byte"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Troncamento del file non riuscito"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2348,7 +2365,7 @@ msgstr ""
 "MMap dinamica esaurita. Aumentare la dimensione di APT::Cache-Limit. Il "
 "valore attuale è: %lu (man 5 apt.conf)."
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2358,7 +2375,7 @@ msgstr ""
 "byte è stato raggiunto."
 
 # (ndt) lunghetta...
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2389,98 +2406,98 @@ msgstr "%limin %lis"
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selezione %s non trovata"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Tipo di abbreviazione non riconosciuto: \"%c\""
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Apertura file di configurazione %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Errore di sintassi %s:%u: il blocco inizia senza nome"
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Errore di sintassi %s:%u: tag non corretto"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Errore di sintassi %s:%u: caratteri extra dopo il valore"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Errore di sintassi %s:%u: le direttive possono essere fatte solo al livello "
 "più alto"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Errore di sintassi %s:%u: troppe inclusioni annidate"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Errore di sintassi %s:%u: incluso da qui"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Errore di sintassi %s:%u: direttiva \"%s\" non supportata"
 
 # (ndt) sarebbe da controllare meglio...
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Errore di sintassi %s:%u: la direttiva clear richiede un albero di opzioni "
 "come argomento"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Errore di sintassi %s:%u: caratteri extra alla fine del file"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Errore"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Fatto"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Opzione a riga di comando \"%c\" [da %s] sconosciuta."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Opzione a riga di comando %s non comprensibile"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Opzione a riga di comando %s non booleana"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "L'opzione %s richiede un argomento."
@@ -2492,82 +2509,82 @@ msgstr ""
 "Opzione %s: la specifica di configurazione dell'oggetto deve avere un "
 "=<valore>."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "L'opzione %s richiede un argomento intero, non \"%s\""
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Opzione \"%s\" troppo lunga"
 
-#: 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 "Il valore %s non è comprensibile, provare \"true\" o \"false\"."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Operazione %s non valida"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Impossibile eseguire stat sul punto di mount %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Impossibile passare a %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Esecuzione di stat sul CD-ROM non riuscita"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Impossibile aprire il file di blocco %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Impossibile impostare il blocco %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, 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:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, 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:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, 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:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2575,270 +2592,283 @@ msgstr ""
 "Viene ignorato il file \"%s\" nella directory \"%s\" poiché ha un'estensione "
 "non valida"
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "In attesa di %s ma non era presente"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault."
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Il sottoprocesso %s ha ricevuto il segnale %u."
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, 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:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Il sottoprocesso %s è uscito inaspettatamente"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Impossibile aprire il file %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Impossibile aprire il descrittore del file %d"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Creazione di un sottoprocesso IPC non riuscita"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Esecuzione non riuscita del compressore "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "lettura, c'erano ancora %lu da leggere ma non ne è rimasto alcuno"
 
-#: apt-pkg/contrib/fileutl.cc:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "scrittura, c'erano ancora %lu da scrivere ma non è stato possibile"
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Si è verificato un problema nel chiudere il file gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Si è verificato un problema nel chiudere il file %s"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, 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:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, 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:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Si è verificato un problema nel sincronizzare il file"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Cache dei pacchetti vuota"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Il file della cache dei pacchetti è danneggiato"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "La versione del file della cache dei pacchetti è incompatibile"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Il file della cache dei pacchetti è danneggiato"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Questo APT non supporta il sistema di versione \"%s\""
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 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:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Dipende"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Pre-dipende"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Consiglia"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Raccomanda"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Va in conflitto"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Sostituisce"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Rende obsoleto"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Rompe"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "Migliora"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "richiesto"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "opzionale"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Generazione albero delle dipendenze"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Versioni candidate"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Generazione delle dipendenze"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Lettura informazioni sullo stato"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Apertura del file di stato %s non riuscita"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Scrittura del file temporaneo di stato %s non riuscita"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Impossibile analizzare il file di pacchetto %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Impossibile analizzare il file di pacchetto %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 "La riga %lu nel file delle sorgenti %s non è corretta ([opzione] non "
 "analizzabile)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 "La riga %lu nel file delle sorgenti %s non è corretta ([opzione] troppo "
 "corta)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 "La riga %lu nel file delle sorgenti %s non è corretta ([%s] non è "
 "un'assegnazione)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 "La riga %lu nel file delle sorgenti %s non è corretta ([%s] non ha una "
 "chiave)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 "La riga %lu nel file delle sorgenti %s non è corretta ([%s] la chiave %s non "
 "ha un valore)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "La riga %lu nel file %s non è corretta (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "La riga %lu nel file %s non è corretta (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "La riga %lu nel file %s non è corretta (URI parse)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "La riga %lu nel file %s non è corretta (absolute dist)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "La riga %lu nel file %s non è corretta (dist parse)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Apertura di %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Riga %u troppo lunga nel file %s."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, 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:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2848,7 +2878,12 @@ msgstr ""
 "maggiori informazioni, consultare \"man 5 apt.conf\" alla sezione \"APT::"
 "Immediate-Configure\" (%d)."
 
-#: apt-pkg/packagemanager.cc:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Impossibile aprire il file \"%s\""
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2860,22 +2895,12 @@ msgstr ""
 "situazione critica, ma se si vuole realmente procedere, attivare l'opzione "
 "APT::Force-LoopBreak."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"Impossibile eseguire immediatamente la configurazione su \"%s\" già "
-"estratto. Per maggiori informazioni, consultare \"man 5 apt.conf\" alla "
-"sezione \"APT::Immediate-Configure\"."
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Il file indice di tipo \"%s\" non è supportato"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2883,7 +2908,7 @@ msgstr ""
 "Il pacchetto %s deve essere reinstallato, ma non è possibile trovarne un "
 "archivio."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2891,12 +2916,12 @@ msgstr ""
 "Errore, pkgProblemResolver::Resolve ha generato delle interruzioni. Questo "
 "potrebbe essere causato da pacchetti bloccati."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati."
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2905,213 +2930,175 @@ msgstr ""
 "Impossibile scaricare alcuni file di indice: saranno ignorati o verranno "
 "usati quelli vecchi."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Manca la directory di liste %spartial."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Manca la directory di archivio %spartial."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "Impossibile bloccare la directory %s"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Scaricamento file %li di %li (%s rimanente)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Scaricamento file %li di %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Impossibile trovare un driver per il metodo %s."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Il metodo %s non si è avviato correttamente"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: 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:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Impossibile eseguire stat su %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 "È necessario inserire alcuni URI di tipo \"source\" nel file sources.list"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "L'elenco dei pacchetti o il file di stato non può essere letto o aperto."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "È consigliato eseguire \"apt-get update\" per correggere questi problemi"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Impossibile leggere l'elenco dei sorgenti."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "Campo non valido nel file delle preferenze %s, manca l'intestazione \"Package"
 "\""
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Impossibile comprendere il tipo di gancio %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Priorità per il gancio non specificata (o zero)"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "La cache ha un sistema di gestione delle versioni incompatibile"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Si è verificato un errore nell'elaborare %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Si è verificato un errore nell'elaborare %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Si è verificato un errore nell'elaborare %s (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Si è verificato un errore nell'elaborare %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Si è verificato un errore nell'elaborare %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Si è verificato un errore nell'elaborare %s (NewVersion%d)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Si è verificato un errore nell'elaborare %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Si è verificato un errore nell'elaborare %s (NewFileDesc2)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Si è verificato un errore nell'elaborare %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "È stato superato il numero di nomi di pacchetti che questo APT può gestire."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "È stato superato il numero di versioni che questo APT può gestire."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "È stato superato il numero di descrizioni che questo APT può gestire."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 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."
 
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Si è verificato un errore nell'elaborare %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Si è verificato un errore nell'elaborare %s (CollectFileProvides)"
-
 # (ndt) il primo è il nome del pacchetto, il secondo la versione
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s"
 
 # (ndt) non mi convince per niente, ma vediamo cosa salta fuori
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Il file fornisce"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "Errore di I/O nel salvare la cache sorgente"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "rename() non riuscita: %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "MD5sum non corrispondente"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Somma hash non corrispondente"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3120,29 +3107,29 @@ msgstr ""
 "Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list "
 "errata o file danneggiato)"
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, 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:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3152,12 +3139,12 @@ msgstr ""
 "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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Errore GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3166,7 +3153,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:1698
+#: apt-pkg/acquire-item.cc:1709
 #, fuzzy, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3176,7 +3163,7 @@ msgstr ""
 "sistemare manualmente questo pacchetto."
 
 # (ndt) sarebbe da controllare se veramente possono esistere più file indice
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3184,41 +3171,41 @@ msgstr ""
 "I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:\" "
 "per il pacchetto %s."
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Le dimensioni non corrispondono"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Impossibile analizzare il file Release %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Nessuna sezione nel file Release %s"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Nessuna voce Hash nel file Release %s"
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, 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:125
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Voce \"Date\" nel file Release %s non valida"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Il blocco vendor %s non contiene impronte"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3227,41 +3214,41 @@ msgstr ""
 "Viene usato il punto di mount del CD-ROM %s\n"
 "Montaggio CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Identificazione... "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Etichette archiviate: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "Smontaggio CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Viene usato il punto di mount del CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Smontaggio CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "In attesa del disco...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Montaggio CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Analisi del disco per file indice...\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3270,7 +3257,7 @@ msgstr ""
 "Trovati %zu indici di pacchetto, %zu indici di sorgente, %zu indici di "
 "traduzione e %zu firme\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3278,16 +3265,16 @@ msgstr ""
 "Impossibile trovare alcun file di pacchetto. Questo potrebbe non essere un "
 "disco Debian o potrebbe essere l'architettura errata."
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Trovata l'etichetta \"%s\"\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Questo non è un nome valido, riprovare.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3296,95 +3283,95 @@ msgstr ""
 "Questo disco è chiamato: \n"
 "\"%s\"\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Copia elenco pacchetti..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Scrittura nuovo elenco sorgenti\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Scritti %i record.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Scritti %i record con %i file mancanti.\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Scritti %i record con %i file mancanti e %i file senza corrispondenze\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Saltato il file inesistente %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Impossibile trovare il record di autenticazione per %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash non corrispondente per %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, 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:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release \"%s\" per \"%s\" non trovato."
 
 # (ndt) dovrebbe essere inteso il Version
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Version \"%s\" per \"%s\" non trovato"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Impossibile trovare il task \"%s\""
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 "Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\""
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Impossibile selezionare le versioni dal pacchetto \"%s\" poiché è virtuale"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3393,130 +3380,154 @@ msgstr ""
 "Impossibile selezionare la versione installata o la candidata dal pacchetto "
 "\"%s\" poiché non sono presenti"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Impossibile selezionare la versione più recente dal pacchetto \"%s\" poiché "
 "è virtuale"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Impossibile selezionare la versione candidata dal pacchetto %s poiché non ha "
 "alcun candidato"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Impossibile selezionare la versione installata dal pacchetto %s poiché non è "
 "installato"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "Installazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Rimozione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "Rimozione completa di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Notata la sparizione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directory \"%s\" mancante"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Impossibile aprire il file \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Estrazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparazione alla configurazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "Pacchetto %s installato"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparazione alla rimozione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "Pacchetto %s rimosso"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparazione alla rimozione completa di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "Pacchetto %s rimosso completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "Esecuzione di dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "Problemi con le dipendenze - Viene lasciato non configurato"
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3524,7 +3535,7 @@ msgstr ""
 "Segnalazione apport non scritta poiché il messaggio di errore indica la "
 "presenza di un fallimento precedente."
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3532,7 +3543,7 @@ msgstr ""
 "Segnalazione apport non scritta poiché il messaggio di errore indica un "
 "errore per disco pieno."
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3540,14 +3551,14 @@ msgstr ""
 "Segnalazione apport non scritta poiché il messaggio di errore indica un "
 "errore di memoria esaurita"
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Segnalazione apport non scritta poiché il messaggio di errore indica un "
 "errore di I/O di dpkg"
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3556,7 +3567,7 @@ msgstr ""
 "Impossibile acquisire il blocco sulla directory di amministrazione (%s). Un "
 "altro processo potrebbe tenerla occupata."
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
@@ -3565,7 +3576,7 @@ msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3573,30 +3584,30 @@ msgstr ""
 "dpkg è stato interrotto. È necessario eseguire \"%s\" per correggere il "
 "problema. "
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Non bloccato"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "Nessun file mirror \"%s\" trovato"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Impossibile leggere il file mirror \"%s\""
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Mirror: %s]"
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3605,7 +3616,7 @@ msgstr ""
 "Impossibile applicare la patch a %s con mmap e con l'utilizzo di operazioni "
 "file. La patch sembra essere danneggiata."
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3614,10 +3625,69 @@ msgstr ""
 "Impossibile applicare la patch a %s con mmap (nessun errore da parte di "
 "mmap). La patch sembra essere danneggiata."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Connessione chiusa prematuramente"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Nota: questo viene svolto automaticamente da dpkg."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Override non corretto: file %s riga %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Override non corretto: file %s riga %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Override non corretto: file %s riga %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "de-compressore"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "lettura, c'erano ancora %lu da leggere ma non ne è rimasto alcuno"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "scrittura, c'erano ancora %lu da scrivere ma non è stato possibile"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "Impossibile eseguire immediatamente la configurazione su \"%s\" già "
+#~ "estratto. Per maggiori informazioni, consultare \"man 5 apt.conf\" alla "
+#~ "sezione \"APT::Immediate-Configure\"."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (CollectFileProvides)"
+
 #, fuzzy
 #~| msgid "Internal error, could not locate member %s"
 #~ msgid "Internal error, could not locate member"
diff --git a/po/ja.po b/po/ja.po
index 41ac85515..d60ffad55 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+0200\n"
 "PO-Revision-Date: 2010-08-25 09:33+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -18,149 +18,150 @@ msgstr ""
 "Content-Transfer-Encoding: 8 bit\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "パッケージ %s のバージョン %s には解決不可能な依存関係があります:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "パッケージ名総数: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "パッケージ構造総数: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  通常パッケージ: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  純粋仮想パッケージ: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  単一仮想パッケージ: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  複合仮想パッケージ: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  欠落: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "個別バージョン総数: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "個別説明総数: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "依存関係総数: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "バージョン/ファイル関係総数: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "説明/ファイル関係総数: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "提供マッピング総数: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Glob 文字列の総数: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "総依存関係・バージョン容量: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "総空き容量: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "総占有容量: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Package ファイル %s が同期していません。"
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "パッケージが見つかりません"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "検索パターンはちょうど 1 つだけ指定してください"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "パッケージ %s が見つかりません"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "パッケージファイル:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "キャッシュが同期しておらず、パッケージファイルを相互参照できません"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Pin パッケージ:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(見つかりません)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  インストールされているバージョン: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  候補: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(なし)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  パッケージ Pin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  バージョンテーブル:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -234,29 +235,29 @@ msgstr ""
 "  -o=? 指定した設定オプションを読み込む (例: -o dir::cache=/tmp)\n"
 "詳細は、apt-cache(8) や apt.conf(5) のマニュアルページを参照してください。\n"
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "ディスクをドライブに入れて enter を押してください"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "'%s' を '%s' にマウントできませんでした"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 "あなたの持っている CD セットの残り全部に、この手順を繰り返してください。"
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "引数がペアではありません"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -284,12 +285,12 @@ msgstr ""
 "  -c=? 指定した設定ファイルを読み込む\n"
 "  -o=? 指定した設定オプションを適用する(例: -o dir::cache=/tmp)\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s は正しい DEB パッケージではありません。"
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -313,41 +314,41 @@ msgstr ""
 "  -c=? 指定した設定ファイルを読み込む\n"
 "  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "%s に書き込めません"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 "debconf のバージョンを取得できません。debconf はインストールされていますか?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "パッケージ拡張子リストが長すぎます"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "ソース拡張子リストが長すぎます"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Contents ファイルへのヘッダの書き込み中にエラーが発生しました"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Contents %s の処理中にエラーが発生しました"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -428,26 +429,26 @@ msgstr ""
 "  -c=? 指定の設定ファイルを読む\n"
 "  -o=? 任意の設定オプションを設定する"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "選択にマッチするものがありません"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "パッケージファイルグループ `%s' に見当たらないファイルがあります"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "DB が壊れていたため、ファイル名を %s.old に変更しました"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB が古いため、%s のアップグレードを試みます"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -455,111 +456,111 @@ msgstr ""
 "DB フォーマットが無効です。apt の古いバージョンから更新したのであれば、データ"
 "ベースを削除し、再作成してください。"
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "DB ファイル %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s の状態を取得するのに失敗しました"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "アーカイブにコントロールレコードがありません"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "カーソルを取得できません"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "警告: ディレクトリ %s が読めません\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "警告: %s の状態を取得できません\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "エラー: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "警告: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "エラー: エラーが適用されるファイルは "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "%s の解決に失敗しました"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "ツリー内での移動に失敗しました"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "%s のオープンに失敗しました"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " リンク %s [%s] を外します\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "%s のリンク読み取りに失敗しました"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "%s のリンク解除に失敗しました"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** %s を %s にリンクするのに失敗しました"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " リンクを外す制限の %sB に到達しました。\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "アーカイブにパッケージフィールドがありませんでした"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s に override エントリがありません\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %1$s メンテナは %3$s ではなく %2$s です\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s にソース override エントリがありません\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s にバイナリ override エントリがありません\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - メモリの割り当てに失敗しました"
 
@@ -569,18 +570,18 @@ msgid "Unable to open %s"
 msgstr "'%s' をオープンできません"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "不正な override %s %lu 行目 #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "不正な override %s %lu 行目 #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "不正な override %s %lu 行目 #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -588,63 +589,51 @@ msgstr "不正な override %s %lu 行目 #3"
 msgid "Failed to read the override file %s"
 msgstr "override ファイル %s を読み込むのに失敗しました"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "'%s' は未知の圧縮アルゴリズムです"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "圧縮出力 %s には圧縮セットが必要です"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "子プロセスへの IPC パイプの作成に失敗しました"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "FILE* の作成に失敗しました"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "fork に失敗しました"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "圧縮子プロセス"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "内部エラー、%s の作成に失敗しました"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "子プロセス IPC の生成に失敗しました"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "以下の圧縮ツールの実行に失敗しました: "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "展開ツール"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "子プロセス/ファイルへの IO が失敗しました"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "MD5 の計算中に読み込みに失敗しました"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "%s のリンク解除で問題が発生しました"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "%s を %s に名前変更できませんでした"
@@ -653,75 +642,79 @@ msgstr "%s を %s に名前変更できませんでした"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "正規表現の展開エラー - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "以下のパッケージには満たせない依存関係があります:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "しかし、%s はインストールされています"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "しかし、%s はインストールされようとしています"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "しかし、インストールすることができません"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "しかし、これは仮想パッケージです"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "しかし、インストールされていません"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "しかし、インストールされようとしていません"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " または"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "以下のパッケージが新たにインストールされます:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "以下のパッケージは「削除」されます:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "以下のパッケージは保留されます:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "以下のパッケージはアップグレードされます:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "以下のパッケージは「ダウングレード」されます:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "以下の変更禁止パッケージは変更されます:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (%s のため) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -729,59 +722,59 @@ msgstr ""
 "警告: 以下の不可欠パッケージが削除されます。\n"
 "何をしようとしているか本当にわかっていない場合は、実行してはいけません!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "アップグレード: %lu 個、新規インストール: %lu 個、"
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "再インストール: %lu 個、"
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "ダウングレード: %lu 個、"
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "削除: %lu 個、保留: %lu 個。\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "注意: タスク '%2$s' に対して '%1$s' を選択しています\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "注意: 正規表現 '%2$s' に対して '%1$s' を選択しています\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "%s は以下のパッケージで提供されている仮想パッケージです:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [インストール済み]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr "[候補バージョンなし]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "インストールするパッケージを明示的に選択する必要があります。"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -792,184 +785,184 @@ msgstr ""
 "おそらく、そのパッケージが見つからないか、もう古くなっているか、\n"
 "あるいは別のソースからのみしか利用できないという状況が考えられます\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "しかし、以下のパッケージで置き換えられています:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "パッケージ '%s' にはインストール候補がありません"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "'%s' のような仮想パッケージは削除できません\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "注意、'%2$s' の代わりに '%1$s' を選択しています\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "すでにインストールされておりアップグレードも設定されていないため、%s をスキッ"
 "プします。\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "%s はインストールされていないのにアップグレードだけが要求されているので、ス"
 "キップします。\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "ダウンロードできないため、%s の再インストールは不可能です。\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s はすでに最新バージョンです。\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s は手動でインストールしたと設定されました。\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "'%3$s' にはバージョン '%1$s' (%2$s) を選択しました\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "'%3$s' にはバージョン '%1$s' (%2$s) を選択しました\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "パッケージ %s はインストールされていないため、削除はできません\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "依存関係を解決しています ..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " 失敗しました。"
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "依存関係を訂正できません"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "アップグレードセットを最小化できません"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " 完了"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 "これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ"
 "ん。"
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "未解決の依存関係があります。-f オプションを試してください。"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "警告: 以下のパッケージは認証されていません!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "認証の警告は上書きされました。\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "検証なしにこれらのパッケージをインストールしますか [y/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "いくつかのパッケージを認証できませんでした"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。"
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "内部エラー、調整が終わっていません"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "おっと、サイズがマッチしません。apt@packages.debian.org にメールしてください"
 
 #. 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of 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:1147
+#: cmdline/apt-get.cc:1161
 #, 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:1154
+#: cmdline/apt-get.cc:1168
 #, 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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "この操作後に %sB のディスク容量が解放されます。\n"
 
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s の空き領域を測定できません"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s に充分な空きスペースがありません。"
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。"
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -980,28 +973,28 @@ msgstr ""
 "続行するには、'%s' というフレーズをタイプしてください。\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "中断しました。"
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "続行しますか [Y/n]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s の取得に失敗しました  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "いくつかのファイルの取得に失敗しました"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1009,19 +1002,19 @@ msgstr ""
 "いくつかのアーカイブが取得できません。apt-get update を実行するか --fix-"
 "missing オプションを付けて試してみてください。"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "足りないパッケージを直すことができません。"
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "インストールを中断します。"
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1035,36 +1028,36 @@ msgstr[1] ""
 "以下のパッケージは、全ファイルが別のパッケージで上書きされたため、\n"
 "システムから消えました:"
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "注意: これは dpkg により自動でわざと行われれます。"
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "パッケージ '%2$s' の利用できないターゲットリリース '%1$s' を無視"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "'%2$s' の代わりに '%1$s' をソースパッケージとして選出しています\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "パッケージ '%2$s' の利用できないバージョン '%1$s' を無視"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "update コマンドは引数をとりません"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "一連のものを削除するようになっていないので、AutoRemover を開始できません"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1082,15 +1075,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "以下の情報がこの問題を解決するために役立つかもしれません:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "内部エラー、AutoRemover が何かを破壊しました"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1101,7 +1094,7 @@ msgstr[0] ""
 msgstr[1] ""
 "以下のパッケージが自動でインストールされましたが、もう必要とされていません:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1113,21 +1106,21 @@ msgstr[1] ""
 "%lu つのパッケージが自動でインストールされましたが、もう必要とされていませ"
 "ん:\n"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "これらを削除するには 'apt-get autoremove' を利用してください。"
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "内部エラー、AllUpgrade が何かを破壊しました"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ"
 "ません:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1135,7 +1128,7 @@ msgstr ""
 "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法"
 "を明示してください)。"
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1147,74 +1140,74 @@ msgstr ""
 "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n"
 "動されていないことが考えられます。"
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "壊れたパッケージ"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "以下の特別パッケージがインストールされます:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "提案パッケージ:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "推奨パッケージ:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "パッケージ %s が見つかりません"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s は自動でインストールしたと設定されました。\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "アップグレードパッケージを検出しています ... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "失敗"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "完了"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "内部エラー、問題リゾルバが何かを破壊しました"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "ダウンロードディレクトリをロックできません"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります"
 
-#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s のソースパッケージが見つかりません"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1224,7 +1217,7 @@ msgstr ""
 "ます:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1236,87 +1229,87 @@ msgstr ""
 "bzr get %s\n"
 "を使用してください。\n"
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB のソースアーカイブを取得する必要があります。\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ソース %s を取得\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "いくつかのアーカイブの取得に失敗しました。"
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
 
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "展開コマンド '%s' が失敗しました。\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 "'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
 
-#: cmdline/apt-get.cc:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "ビルドコマンド '%s' が失敗しました。\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "子プロセスが失敗しました"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります"
 
-#: cmdline/apt-get.cc:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s のビルド依存情報を取得できません"
 
-#: cmdline/apt-get.cc:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s にはビルド依存情報が指定されていません。\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1325,7 +1318,7 @@ msgstr ""
 "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
 "ができません"
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1334,14 +1327,14 @@ msgstr ""
 "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
 "ができません"
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1350,7 +1343,7 @@ msgstr ""
 "入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対"
 "する %1$s の依存関係を満たすことができません"
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1359,30 +1352,30 @@ msgstr ""
 "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
 "ができません"
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s"
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s のビルド依存関係を満たすことができませんでした。"
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "ビルド依存関係の処理に失敗しました"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) へ接続しています"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "サポートされているモジュール:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1477,7 +1470,7 @@ msgstr ""
 "apt-get(8)、sources.list(5)、apt.conf(5) を参照してください。\n"
 "                        この APT は Super Cow Powers 化されています。\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1489,33 +1482,33 @@ msgstr ""
 "      ロックが非アクティブであることから、今この時点の状態に妥当性が\n"
 "      あるとは言い切れないことに注意してください!"
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "ヒット "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "取得:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "無視 "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "エラー "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%sB を %s で取得しました (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [処理中]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1526,46 +1519,62 @@ msgstr ""
 " '%s'\n"
 "とラベルの付いたディスクをドライブ '%s' に入れて enter を押してください\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "しかし、インストールされていません"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s は手動でインストールしたと設定されました。\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s は自動でインストールしたと設定されました。\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s はすでに最新バージョンです。\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s はすでに最新バージョンです。\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s は手動でインストールしたと設定されました。\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "%s のオープンに失敗しました"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1587,11 +1596,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "不明なパッケージレコードです!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1649,197 +1658,199 @@ msgstr "が重要です。これを修正して「導入」を再度実行して
 msgid "Merging available information"
 msgstr "入手可能情報をマージしています"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "パイプの生成に失敗しました"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "gzip の実行に失敗しました"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "壊れたアーカイブ"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "tar チェックサムが失敗しました。アーカイブが壊れています"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "未知の TAR ヘッダタイプ %u、メンバー %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "不正なアーカイブ署名"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "アーカイブメンバーヘッダの読み込みに失敗しました"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "不正なアーカイブメンバーヘッダ %s"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "不正なアーカイブメンバーヘッダ"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "アーカイブが不足しています"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "アーカイブヘッダの読み込みに失敗しました"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "リンクされているノードで DropNode が呼ばれました"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "ハッシュ要素を特定することができません!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "diversion の割り当てに失敗しました"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "AddDiversion での内部エラー"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "%s -> %s と %s/%s の diversion を上書きしようとしています"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "%s -> %s の diversion が二重に追加されています"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "設定ファイル %s/%s が重複しています"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "ファイル %s の書き込みに失敗しました"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "%s のクローズに失敗しました"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "パス %s は長すぎます"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s を複数回展開しています"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "ディレクトリ %s は divert されています"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 "このパッケージは diversion のターゲットの %s/%s に書き込もうとしています"
 
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "diversion パスが長すぎます"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "ディレクトリ %s が非ディレクトリに置換されようとしています"
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "ハッシュバケツ内でノードを特定するのに失敗しました"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "パスが長すぎます"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "%s に対するバージョンのないパッケージマッチを上書きします"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "ファイル %s/%s がパッケージ %s のものを上書きします"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s を読み込むことができません"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s の状態を取得できません"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "%s の削除に失敗しました"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "%s を作成できません"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "%sinfo の状態の取得に失敗しました"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "info と temp ディレクトリは同じファイルシステム上になければなりません"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "パッケージリストを読み込んでいます"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "管理ディレクトリ %sinfo への移動に失敗しました"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "パッケージ名取得中の内部エラー"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "ファイルリストを読み込んでいます"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1850,115 +1861,116 @@ msgstr ""
 "とができないなら、その内容を空にして即座に同じバージョンのパッケージを再イン"
 "ストールしてください!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "リストファイル %sinfo/%s の読み込みに失敗しました"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "内部エラー、ノードの取得"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "diversions ファイル %sdiversions のオープンに失敗しました"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "diversion ファイルが壊れています"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "diversion ファイルに不正な行があります: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "内部エラー、diversion の追加"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "最初にパッケージキャッシュを初期化しなければなりません"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Package: ヘッダを見つけるのに失敗しました。オフセット %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "status ファイルに不正な ConfFile セクションがあります。オフセット %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "MD5 の解析エラー。オフセット %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "'%s' メンバーがないため、正しい DEB アーカイブではありません"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 "これは正しい DEB アーカイブではありません。'%s'、'%s'、'%s' のいずれのメン"
 "バーもありません"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "%s に変更できませんでした"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "内部エラー、メンバー %s を特定できません"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "正しいコントロールファイルを特定できませんでした"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "解析できないコントロールファイル"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "%s に対してパイプを開けませんでした"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "%s プロセスからの読み込みエラー"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "状態の取得に失敗しました"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "変更時刻の設定に失敗しました"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "CD-ROM データベース %s を読み込むことができません"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1966,56 +1978,56 @@ msgstr ""
 "この CD-ROM を APT に認識させるには apt-cdrom を使用してください。新しい CD-"
 "ROM を追加するために apt-get update は使用できません。"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "CD が違います"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "%s の CD-ROM は使用中のためアンマウントすることができません。"
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "ディスクが見つかりません。"
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "ファイルが見つかりません"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "不正な URI です。ローカルの URI は // で始まってはいけません"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "ログインしています"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "ピアネームを決定することができません"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "ローカルネームを決定することができません"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "サーバから接続を拒絶されました。応答: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER 失敗、サーバ応答: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS 失敗、サーバ応答: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2023,303 +2035,308 @@ msgstr ""
 "プロキシサーバが指定されていますが、ログインスクリプトが設定されていません。"
 "Acquire::ftp::ProxyLogin が空です。"
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "ログインスクリプトのコマンド '%s' 失敗、サーバ応答: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE 失敗、サーバ応答: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "接続タイムアウト"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "サーバが接続を切断しました"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "読み込みエラー"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "レスポンスがバッファをオーバフローさせました。"
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "プロトコルが壊れています"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "書き込みエラー"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "ソケットを作成できません"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "データソケットへ接続できませんでした。接続がタイムアウトしました"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "パッシブソケットに接続できません。"
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo はリスニングポートを取得することができませんでした"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "ソケットをバインドできませんでした"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "ソケットをリスンできませんでした"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "ソケットの名前を特定できませんでした"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "PORT コマンドを送信できません"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "未知のアドレスファミリ %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT に失敗しました。サーバ応答: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "データソケット接続タイムアウト"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "接続を accept できません"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "ファイルのハッシュでの問題"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "ファイルを取得できません。サーバ応答 '%s'"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "データソケットタイムアウト"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "データ転送に失敗しました。サーバ応答 '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "問い合わせ"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "呼び出せません"
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "%s (%s) へ接続しています"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "%s:%s (%s) への接続を開始できません。"
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "%s:%s (%s) へ接続できませんでした。接続がタイムアウトしました"
 
-#: methods/connect.cc:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s へ接続しています"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "'%s' を解決できませんでした"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "'%s' が一時的に解決できません"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "%s:%s へ接続できません:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!"
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "少なくとも 1 つの不正な署名が発見されました。"
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "署名を検証するための 'gpgv' の実行ができませんでした (gpgv はインストールされ"
 "ていますか?)"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "gpgv の実行中に未知のエラーが発生"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "以下の署名が無効です:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "公開鍵を利用できないため、以下の署名は検証できませんでした:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "ヘッダの待機中です"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "%u 文字を超える 1 行のヘッダを取得しました"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "不正なヘッダ行です"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "http サーバが不正なリプライヘッダを送信してきました"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http サーバが不正な Content-Length ヘッダを送信してきました"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http サーバが不正な Content-Range ヘッダを送信してきました"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "http サーバのレンジサポートが壊れています"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "不明な日付フォーマットです"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "select に失敗しました"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "接続タイムアウト"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "出力ファイルへの書き込みでエラーが発生しました"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "ファイルへの書き込みでエラーが発生しました"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "ファイルへの書き込みでエラーが発生しました"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "サーバからの読み込みに失敗しました"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "ファイルの切り詰めに失敗しました"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "不正なヘッダです"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "接続失敗"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "内部エラー"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "空のファイルを mmap できません"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "ファイルデスクリプタ %i は重複できません"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "%lu バイトの mmap ができませんでした"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "mmap をクローズできません"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "mmap を同期できません"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "%lu バイトの mmap ができませんでした"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "ファイルの切り詰めに失敗しました"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2328,14 +2345,14 @@ msgstr ""
 "動的 MMap が範囲を越えました。APT::Cache-Limit の大きさを増やしてください。現"
 "在値は %lu です (man 5 apt.conf を参照)。"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr "%lu バイトの上限に達しているため、MMap のサイズを増やせません。"
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2365,95 +2382,95 @@ msgstr "%li分 %li秒"
 msgid "%lis"
 msgstr "%li秒"
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "選択された %s が見つかりません"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "理解できない省略形式です: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "設定ファイル %s をオープンできませんでした"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "文法エラー %s:%u: ブロックが名前なしで始まっています。"
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "文法エラー %s:%u: 不正なタグです"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "文法エラー %s:%u: 値の後に余分なゴミが入っています"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "文法エラー %s:%u: 命令はトップレベルでのみ実行できます"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "文法エラー %s:%u: インクルードのネストが多すぎます"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "文法エラー %s:%u: ここからインクルードされています"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "文法エラー %s:%u: 未対応の命令 '%s'"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "文法エラー %s:%u: clear ディレクティブは、引数としてオプションツリーを必要と"
 "します"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... エラー!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... 完了"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "コマンドラインオプション '%c' [%s から] は不明です。"
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "コマンドラインオプション %s を理解できません"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "コマンドラインオプション %s は boolean ではありません"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "オプション %s には引数が必要です。"
@@ -2463,340 +2480,353 @@ msgstr "オプション %s には引数が必要です。"
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "オプション %s: 設定項目には =<値> を指定する必要があります。"
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "オプション %s には '%s' ではなく整数の引数が必要です"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "オプション '%s' は長すぎます"
 
-#: 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 "%s を解釈することができません。true か false を試してください。"
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "不正な操作 %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "マウントポイント %s の状態を取得できません"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "%s へ変更することができません"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "cdrom の状態を取得するのに失敗しました"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "読み込み専用のロックファイル %s にロックは使用しません"
 
-#: apt-pkg/contrib/fileutl.cc:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "ロックファイル %s をオープンできません"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "nfs マウントされたロックファイル %s にはロックを使用しません"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "ロック %s が取得できませんでした"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s を待ちましたが、そこにはありませんでした"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "子プロセス %s がセグメンテーション違反を受け取りました。"
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "子プロセス %s がシグナル %u を受け取りました。"
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "子プロセス %s がエラーコード (%u) を返しました"
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "子プロセス %s が予期せず終了しました"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "ファイル %s をオープンできませんでした"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "ファイルデスクリプタ %d を開けませんでした"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "子プロセス IPC の生成に失敗しました"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "以下の圧縮ツールの実行に失敗しました: "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "読み込みが %lu 残っているはずですが、何も残っていません"
 
-#: apt-pkg/contrib/fileutl.cc:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "あと %lu 書き込む必要がありますが、書き込むことができませんでした"
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "gzip ファイル %s のクローズ中に問題が発生しました"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "ファイル %s のクローズ中に問題が発生しました"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "%s から %s へのファイル名変更中に問題が発生しました"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "ファイル %s の削除中に問題が発生しました"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "ファイルの同期中に問題が発生しました"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "空のパッケージキャッシュ"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "パッケージキャッシュファイルが壊れています"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "このパッケージキャッシュファイルは互換性がないバージョンです"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "パッケージキャッシュファイルが壊れています"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "この APT はバージョニングシステム '%s' をサポートしていません"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "パッケージキャッシュが異なるアーキテクチャ用に構築されています"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "依存"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "先行依存"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "提案"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "推奨"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "競合"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "置換"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "廃止"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "破壊"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "拡張"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "重要"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "要求"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "標準"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "任意"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "特別"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "依存関係ツリーを作成しています"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "候補バージョン"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "依存関係の生成"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "状態情報を読み取っています"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "状態ファイル %s のオープンに失敗しました"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "一時状態ファイル %s の書き込みに失敗しました"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "パッケージファイル %s を解釈することができません (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "パッケージファイル %s を解釈することができません (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 "ソースリスト %2$s の %1$lu 行目が不正です ([オプション] を解釈できません)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 "ソースリスト %2$s の %1$lu 行目が不正です ([オプション] が短かすぎます)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] は割り当てられていません)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s にキーがありません)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] キー %4$s に値がありません)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "%s をオープンしています"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。"
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2805,7 +2835,12 @@ msgstr ""
 "'%s' の即時設定は動作しません。詳細については man 5 apt.conf の APT::"
 "Immediate-Configure の項を参照してください。(%d)"
 
-#: apt-pkg/packagemanager.cc:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "ファイル '%s' をオープンできませんでした"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2816,21 +2851,12 @@ msgstr ""
 "ケージ %s を削除します。これは多くの場合に問題が起こる原因となります。本当に"
 "これを行いたいなら、APT::Force-LoopBreak オプションを有効にしてください。"
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"展開済みの '%s' への即時設定は動作しません。詳細については man 5 apt.conf の "
-"APT::Immediate-Configure の項を参照してください。"
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "インデックスファイルのタイプ '%s' はサポートされていません"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2838,7 +2864,7 @@ msgstr ""
 "パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見"
 "つけることができませんでした。"
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2846,11 +2872,11 @@ msgstr ""
 "エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー"
 "ジが原因です。"
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。"
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2859,241 +2885,203 @@ msgstr ""
 "いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視され"
 "るか、古いものが代わりに使われます。"
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "リストディレクトリ %spartial が見つかりません。"
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "アーカイブディレクトリ %spartial が見つかりません。"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "ディレクトリ %s をロックできません"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "ファイルを取得しています %li/%li (残り %s)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "ファイルを取得しています %li/%li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "メソッドドライバ %s が見つかりません。"
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "メソッド %s が正常に開始しませんでした"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "'%s' とラベルの付いたディスクをドライブ '%s' に入れて enter を押してくださ"
 "い。"
 
-#: apt-pkg/init.cc:147
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "パッケージングシステム '%s' はサポートされていません"
 
-#: apt-pkg/init.cc:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "適切なパッケージシステムタイプを特定できません"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "%s の状態を取得できません。"
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "sources.list に 'ソース' URI を指定する必要があります"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "パッケージリストまたはステータスファイルを解釈またはオープンすることができま"
 "せん。"
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "これらの問題を解決するためには apt-get update を実行する必要があるかもしれま"
 "せん"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "ソースのリストを読むことができません。"
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "不正なレコードがプリファレンスファイル %s に存在します。パッケージヘッダがあ"
 "りません"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "pin タイプ %s が理解できませんでした"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "pin で優先度 (または 0) が指定されていません"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "キャッシュに非互換なバージョニングシステムがあります"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "%s を処理中にエラーが発生しました (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "%s を処理中にエラーが発生しました (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "%s を処理中にエラーが発生しました (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "%s を処理中にエラーが発生しました (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "%s を処理中にエラーが発生しました (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "%s を処理中にエラーが発生しました (NewVersion%d)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "%s を処理中にエラーが発生しました (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "%s を処理中にエラーが発生しました (NewFileDesc2)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s を処理中にエラーが発生しました (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "この APT が対応している以上の数のパッケージが指定されました。"
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "この APT が対応している以上の数のバージョンが要求されました。"
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "この APT が対応している以上の数の説明が要求されました。"
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "この APT が対応している以上の数の依存関係が発生しました。"
 
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "%s を処理中にエラーが発生しました (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "%s を処理中にエラーが発生しました (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした"
 
-#: apt-pkg/pkgcachegen.cc:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "ソースパッケージリスト %s の状態を取得できません"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "ファイル提供情報を収集しています"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "名前の変更に失敗しました。%s (%s -> %s)"
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum が適合しません"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "ハッシュサムが適合しません"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, 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:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3103,12 +3091,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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG エラー: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3117,7 +3105,7 @@ msgstr ""
 "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
 "で修正する必要があります (存在しないアーキテクチャのため)。"
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3126,7 +3114,7 @@ msgstr ""
 "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
 "で修正する必要があります。"
 
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3134,41 +3122,41 @@ msgstr ""
 "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
 "フィールドがありません。"
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "サイズが適合しません"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Release ファイル %s を解釈することができません"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Release ファイル %s にセクションがありません"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Release ファイル %s に Hash エントリがありません"
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Release ファイル %s に無効な 'Valid-Until' エントリがあります"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Release ファイル %s に無効な 'Date' エントリがあります"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "ベンダブロック %s は鍵指紋を含んでいません"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3177,41 +3165,41 @@ msgstr ""
 "CD-ROM マウントポイント %s を使用します\n"
 "CD-ROM をマウントしています\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "確認しています.. "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "格納されたラベル: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "CD-ROM をアンマウントしています ...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "CD-ROM マウントポイント %s を使用します\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "CD-ROM をアンマウントしています\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "ディスクを待っています ...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "CD-ROM をマウントしています ...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "ディスクのインデックスファイルを走査しています ..\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3220,7 +3208,7 @@ msgstr ""
 "%zu のパッケージインデックス、%zu のソースインデックス、%zu の翻訳インデック"
 "ス、%zu の署名を見つけました\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3228,16 +3216,16 @@ msgstr ""
 "パッケージファイルを配置できません。Debian のディスクではないか、誤ったアーキ"
 "テクチャではないでしょうか?"
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "ラベル '%s' を見つけました\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "これは有効な名前ではありません。再試行してください。\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3246,92 +3234,92 @@ msgstr ""
 "このディスクは以下のように呼ばれます: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "パッケージリストをコピーしています ..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "新しいソースリストを書き込んでいます\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "このディスクのソースリストのエントリ:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i レコードを書き込みました。\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n"
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "%i レコードを書き込みました。%i 個のファイルが見つからず、%i 個の適合しない"
 "ファイルがあります。\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "存在しないファイル %s をスキップしています"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "認証レコードが見つかりません: %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "ハッシュサムが適合しません: %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "%s にキーリングがインストールされていません。"
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "タスク '%s' が見つかりません"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "正規表現 '%s' ではパッケージは見つかりませんでした"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "純粋な仮想パッケージのため、パッケージ '%s' のバージョンを選べません"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3340,125 +3328,149 @@ msgstr ""
 "パッケージ '%s' のインストール済みまたは候補のバージョンはいずれも存在しない"
 "ので選べません"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "純粋な仮想パッケージのため、パッケージ '%s' の最新バージョンを選べません"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr "候補が存在しないので、パッケージ %s の候補バージョンを選べません"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "インストールされていないので、パッケージ %s のインストール済みバージョンを選"
 "べません。"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "%s をインストールしています"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "%s を設定しています"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "%s を削除しています"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s を完全に削除しています"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "%s の消失を記録しています"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "インストール後トリガ %s を実行しています"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "ディレクトリ '%s' が見つかりません"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "ファイル '%s' をオープンできませんでした"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "%s を準備しています"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s を展開しています"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s の設定を準備しています"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "%s をインストールしました"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s の削除を準備しています"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "%s を削除しました"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s を完全に削除する準備をしています"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s を完全に削除しました"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "ログに書き込めません。openpty() に失敗しました (/dev/pts がマウントされていな"
 "い?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "dpkg を実行しています"
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "依存関係の問題 - 未設定のままにしています"
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3466,7 +3478,7 @@ msgstr ""
 "エラーメッセージは前の失敗から続くエラーであることを示しているので、レポート"
 "は書き込まれません。"
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3474,7 +3486,7 @@ msgstr ""
 "エラーメッセージはディスクフルエラーであることを示しているので、レポートは書"
 "き込まれません。"
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3482,14 +3494,14 @@ msgstr ""
 "エラーメッセージはメモリ超過エラーであることを示しているので、レポートは書き"
 "込まれません。"
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "エラーメッセージは dpkg I/O エラーであることを示しているので、レポートは書き"
 "込まれません。"
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3498,7 +3510,7 @@ msgstr ""
 "管理用ディレクトリ (%s) をロックできません。これを使う別のプロセスが動いてい"
 "ませんか?"
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
@@ -3506,7 +3518,7 @@ msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3514,30 +3526,30 @@ msgstr ""
 "dpkg は中断されました。問題を修正するには '%s' を手動で実行する必要がありま"
 "す。"
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "ロックされていません"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "ミラーファイル '%s' が見つかりません "
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "ミラーファイル '%s' が見つかりません "
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[ミラー: %s]"
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3546,7 +3558,7 @@ msgstr ""
 "mmap およびファイル操作用法へのパッチ %s を適用できません - パッチが壊れてい"
 "るようです。"
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3555,10 +3567,68 @@ msgstr ""
 "mmap へのパッチ %s を適用できません (しかし mmap 固有の失敗ではありません) - "
 "パッチが壊れているようです。"
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "途中で接続がクローズされました"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "注意: これは dpkg により自動でわざと行われれます。"
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "不正な override %s %lu 行目 #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "不正な override %s %lu 行目 #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "不正な override %s %lu 行目 #3"
+
+#~ msgid "decompressor"
+#~ msgstr "展開ツール"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "読み込みが %lu 残っているはずですが、何も残っていません"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "あと %lu 書き込む必要がありますが、書き込むことができませんでした"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "展開済みの '%s' への即時設定は動作しません。詳細については man 5 apt.conf "
+#~ "の APT::Immediate-Configure の項を参照してください。"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "%s を処理中にエラーが発生しました (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "%s を処理中にエラーが発生しました (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "%s を処理中にエラーが発生しました (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "%s を処理中にエラーが発生しました (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "%s を処理中にエラーが発生しました (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "%s を処理中にエラーが発生しました (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "%s を処理中にエラーが発生しました (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "%s を処理中にエラーが発生しました (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "%s を処理中にエラーが発生しました (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "%s を処理中にエラーが発生しました (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "内部エラー、メンバーを特定できません"
 
diff --git a/po/km.po b/po/km.po
index 75403c83d..52c081a3c 100644
--- a/po/km.po
+++ b/po/km.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_km\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -20,153 +20,154 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "កញ្ចប់ %s កំណែ %s មាន​ភាព​អាស្រ័យ​មិន​ត្រូវ​គ្នា ៖\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "ឈ្មោះ​កញ្ចប់​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 #, fuzzy
 msgid "Total package structures: "
 msgstr "ឈ្មោះ​កញ្ចប់​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  កញ្ចប់​ធម្មតា ៖ "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  កញ្ចប់​និម្មិត​សុទ្ធ ៖ "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  កញ្ចប់​និម្មិត​តែ​មួយ ៖ "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  កញ្ចប់​និម្មិត​លាយ ៖ "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  បាត់បង់ ៖ "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "កំណែ​ផ្សេងៗ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "កំណែ​ផ្សេងៗ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "ភាព​អាស្រ័យ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "ទំនាក់ទំនង កំណែ/ឯកសារ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "ទំនាក់ទំនង កំណែ/ឯកសារ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "ការផ្គូរផ្គង​ការផ្ដល់​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "ខ្សែ​អក្សរ​សរុប​ ៖ "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "ទំហំ​កំណែ​ភាព​អាស្រ័យ​សរុប ៖ "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "ទំហំ slack សរុប ៖"
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "ទំហំ​សរុប​ដែល​ទុក​សម្រាប់ ៖ "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "ឯកសារ​កញ្ចប់ %s នៅ​ខាងក្រៅ​ការ​ធ្វើសមកាលកម្ម ។"
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "រក​កញ្ចប់​មិន​ឃើញ"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "អ្នក​ត្រូវ​តែ​ផ្ដល់​លំនាំ​មួយ​ដែល​ពិត​ប្រាកដ"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "មិន​អាច​កំណត់​ទីតាំង​កញ្ចប់ %s បានឡើយ"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "ឯកសារ​កញ្ចប់ ៖"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ខ្ទាស់ ៖"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(រក​មិន​ឃើញ)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  បាន​ដំឡើង ៖ "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  សាកល្បង ៖ "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(គ្មាន)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  ខ្ទាស់​កញ្ចប់ ៖ "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  តារាង​កំណែ ៖"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -239,29 +240,29 @@ msgstr ""
 "  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
 "មើល​ apt-cache(8) និង​ apt.conf(5) សម្រាប់​ព័ត៌មាន​បន្ថែម​​មាន​ក្នុង​ទំព័រ​សៀវភៅដៃ​ ។\n"
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "សូម​ផ្ដល់​ឈ្មោះ​ឲ្យ​ថាស​នេះ ឧទាហរណ៍​ដូចជា 'ដេបៀន 2.1r1 ថាស​ទី ១' ជាដើម"
 
-#: cmdline/apt-cdrom.cc:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "សូម​បញ្ចូល​ថាស​ក្នុង​ដ្រាយ​ហើយ​ចុច​បញ្ចូល​"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "ធ្វើដំណើរការ​នេះ​ម្តង​ទៀត​ សម្រាប់​ស៊ីឌី​ទាំងអស់​​ក្នុង​សំណុំ​របស់​អ្នក ។"
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "​អាគុយម៉ង់​មិន​មាន​គូ​ទេ"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -289,12 +290,12 @@ msgstr ""
 "  -c=? អាន​ឯកសារ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ \n"
 "  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s មិនមែន​ជា​កញ្ចប់​ DEB ត្រឹមត្រូវ​ទេ​ ។"
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -318,40 +319,40 @@ msgstr ""
 "  -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n"
 "  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "មិន​អាច​សរសេរ​ទៅ %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "មិន​អាច​ទទួល​យក​កំណែ​ debconf  ។ តើ​ debconf បានដំឡើង​ឬ ?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "បញ្ជី​ផ្នែក​បន្ថែម​កញ្ចប់​វែង​ពេក"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "បញ្ជី​ផ្នែក​បន្ថែម​ប្រភព​វែង​ពេក"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "កំហុស​សរសេរ​បឋម​កថា​ទៅ​ឯកសារ​មាតិកា"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "កំហុស​ដំណើរការ​មាតិកា​ %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -432,26 +433,26 @@ msgstr ""
 "  -c=?  អាន​ឯកសារ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ​\n"
 "  -o=?  កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "គ្មាន​ការ​ជ្រើស​​ដែល​ផ្គួផ្គង​"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "ឯកសារ​មួយ​ចំនួន​បាត់បងពី​ក្រុម​ឯកសារ​កញ្ចប់​ `%s'"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "DB បាន​ខូច​, ឯកសារ​បាន​ប្តូរ​ឈ្មោះ​ទៅ​ជា​ %s.old ។"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB ចាស់​, កំពុង​ព្យាយាម​ធ្វើ​ឲ្យ %s ប្រសើរ​ឡើង"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 #, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
@@ -460,111 +461,111 @@ msgstr ""
 "ទ្រង់ទ្រាយ​មូលដ្ឋាន​ទិន្នន័យ​មិន​ត្រឹមត្រូវ ។ ប្រសិន​បើ​អ្នក​បាន​ធ្វើ​ឲ្យ​វា​ប្រសើឡើង​ពី​កំណែ​ចាស់​របស់ apt សូម​យក​"
 "មូលដ្ឋាន​ទិន្នន័យ​ចេញ និង​បង្កើត​មូលដ្ឋាន​ទិន្នន័យ​ឡើង​វិញ ។"
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "មិន​អាច​បើក​ឯកសារ​ DB បានទេ %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការថ្លែង  %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "ប័ណ្ណសារ​គ្មាន​កំណត់​ត្រា​ត្រួត​ពិនិត្យ​ទេ​"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "មិន​អាច​យក​ទស្សន៍ទ្រនិច​"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: មិន​អាច​អាន​ថត %s បាន​ឡើយ\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W ៖ មិន​អាច​ថ្លែង %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: កំហុស​អនុវត្ត​លើ​ឯកសារ​"
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "បរាជ័យ​ក្នុង​ការ​ដោះស្រាយ %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "មែក​ធាង បាន​បរាជ័យ"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន​តំណ​ %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ផ្ដាច់ %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** បាន​បរាជ័យ​ក្នុង​ការ​ត​ %s ទៅ %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: 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:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - បរាជ័យ​ក្នុង​ការ​​បម្រុង​​ទុក​សតិ​"
 
@@ -574,18 +575,18 @@ msgid "Unable to open %s"
 msgstr "មិន​អាចបើក​ %s បានឡើយ"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -593,63 +594,51 @@ msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អានឯកសារ​បដិសេធ %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "មិន​ស្គាល់​ក្បួន​ដោះស្រាយ​ការបង្ហាប់​ '%s'"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "​ទិន្នផល​ដែល​បាន​បង្ហាប់​​ %s ត្រូវ​ការ​កំណត់​ការបង្ហាប់​"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​បំពង់​ IPC សម្រាប់​ដំណើរ​ការ​រង​"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "បាន​បរាជ័យ​ក្នុងការ​ដាក់ជា​ពីរផ្នែក​"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "បង្ហាប់កូន"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "កំហុស​ខាងក្នុង​ បរាជ័យ​ក្នុង​ការ​បង្កើត​ %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ដំណើរការ​រង​ IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ​កម្មវិធី​បង្ហាប់ "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "កម្មវិធី​ពន្លា"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "IO សម្រាប់​ដំណើរការ​រង​/ឯកសារ​ បាន​បរាជ័យ​"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការអាន​ នៅពេល​គណនា MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s"
@@ -658,75 +647,79 @@ msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex កំហុស​ការចងក្រង​ - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " ឬ"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (ដោយ​សារតែ​ %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -734,60 +727,60 @@ msgstr ""
 "ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​ខាងក្រោម​នឹង​ត្រូវ​បាន​យកចេញ ។\n"
 "ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu ​ត្រូវបានបន្ទាប់ "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "កញ្ចប់​ %s ជា​កញ្ចប់​និម្មិត​ដែល​បាន​ផ្តល់​ដោយ​ ៖\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [បានដំឡើង​]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 #, fuzzy
 msgid " [Not candidate version]"
 msgstr "កំណែ​សាកល្បង​"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "អ្នក​គួរតែ​ជ្រើស​យក​មួយ​​ឲ្យ​ច្បាស់​ដើម្បី​ដំឡើង​ ។"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -798,177 +791,177 @@ msgstr ""
 "វា​មានន័យ​ថា​បាត់កញ្ចប់ ​គេ​លែង​ប្រើ ឬ\n"
 "អាច​រក​បាន​ពី​ប្រភព​ផ្សេង​ទៀត\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "ទោះ​យ៉ាងណា​ក៏ដោយ កញ្ចប់​ខាងក្រោម​ជំនួស​វា ៖"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "កញ្ចប់​ %s មិនមាន​ការដំឡើងសាកល្បងឡើយ"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណត់​​ ។\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណត់​​ ។\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "មិនអាចធ្វើការដំឡើង %s ឡើងវិញបានទេ វា​មិនអាចត្រូវបាន​ទាញយកបានឡើយ ។\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "កំពុង​កែ​ភាពអាស្រ័យ​..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " បាន​បរាជ័យ ។"
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ​"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ​"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " ធ្វើ​រួច"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ 'apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។"
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "ភាព​អាស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ការ​ប្រើ -f ។"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ព្រមាន​ ៖ មិនអាច​ធ្វើការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់ខាងក្រោមបានឡើយ !"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "បានបដិសេធ​ការព្រមាន​ការផ្ទៀងផ្ទាត់ភាព​ត្រឹមត្រូវ ។\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោយគ្មានការពិនិត្យ​បញ្ជាក់ [y/N] ? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "មិនអាច​ផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់​មួយចំនួន​បានឡើយ​"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "មាន​បញ្ហា​ ហើយ -y ត្រូវ​បាន​ប្រើ​ដោយគ្មាន​​ --force​-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "កំហុស​ខាងក្នុង កញ្ចប់​ដំឡើង​ត្រូវ​បាន​ហៅ​​ជាមួយ​កញ្ចប់​ដែល​ខូច !"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "កញ្ចប់ ​ត្រូវការឲ្យ​យក​ចេញ​​ ប៉ុន្តែមិនអនុញ្ញាត​ឲ្យយកចេញឡើយ ។"
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "កំហុស​ខាងក្នុង​ ការ​រៀប​តាម​លំដាប់​មិន​បាន​បញ្ចប់ឡើយ"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "យី អី​ក៏​ចម្លែង​ម្លេះ.. ទំហំ​មិន​ដូច​គ្នា​ឡើយ ។ សូម​ផ្ញើ​អ៊ីមែល​ទៅ apt@packages.debian.org"
 
 #. 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:1142
+#: cmdline/apt-get.cc:1156
 #, 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:1147
+#: cmdline/apt-get.cc:1161
 #, 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:1154
+#: cmdline/apt-get.cc:1168
 #, 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:1159
+#: cmdline/apt-get.cc:1173
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n"
 
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "អ្នក​គ្មាន​ទំហំ​​ទំនេរ​គ្រប់គ្រាន់​ក្នុង​​ %s ឡើយ ។"
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "បានបញ្ជាក់​តែប្រតិបត្តិការដែលមិនសំខាន់ប៉ុណ្ណោះ ប៉ុន្តែ​នេះមិនមែនជាប្រតិបត្តិការមិនសំខាន់នោះទេ ។"
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "បាទ/ចាស ធ្វើ​ដូច​ដែល​ខ្ញុំ​និយាយ !"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -979,28 +972,28 @@ msgstr ""
 "ដើម្បី​បន្ត ​​វាយ​ក្នុង​ឃ្លា​ '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "បោះបង់ ។"
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1008,19 +1001,19 @@ msgstr ""
 "អនុញ្ញាត​ឲ្យ​ទៅ​ប្រមូល​យក​ប័ណ្ណសារ​មួយ​ចំនួន​ ប្រហែល​ជា​រត់​ភាព​ទាន់​សម័យ apt-get ឬ ព្យាយាមប្រើ​ជាមួយ --"
 "fix- ដែលបាត់ឬ់ ?"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix- ដែលបាត់​ និង ​ស្វប​មេឌៀ​ដែល​មិនបាន​​គាំទ្រនៅពេល​បច្ចុប្បន្ន​"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "មិន​អាច​កែ​កញ្ចប់​ដែលបាត់បង់​បានឡើយ ។"
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1030,35 +1023,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1074,16 +1067,16 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1093,7 +1086,7 @@ msgid_plural ""
 msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1101,26 +1094,26 @@ msgid_plural ""
 msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ 'apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 "ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។"
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1132,80 +1125,80 @@ msgstr ""
 "ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើត​ឡើយ​\n"
 " ឬ ​បានយក​ចេញ​ពីការមកដល់ ។"
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "កញ្ចប់​ដែល​បាន​ខូច​"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "បាន​បរាជ័យ"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "ធ្វើរួច​"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
 
-#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1213,104 +1206,104 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ទៅប្រមូល​ប្រភព​ %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។"
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n"
 
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
 
-#: cmdline/apt-get.cc:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់"
 
-#: cmdline/apt-get.cc:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s"
 
-#: cmdline/apt-get.cc:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, 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:2889
+#: cmdline/apt-get.cc:2924
 #, 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:2912
+#: cmdline/apt-get.cc:2947
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក"
 
-#: cmdline/apt-get.cc:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1319,37 +1312,37 @@ msgstr ""
 "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​"
 "តម្រូវការ​កំណែបានឡើយ"
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, 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:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s"
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។"
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1434,7 +1427,7 @@ msgstr ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1442,33 +1435,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "វាយ​"
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "យក​ ៖"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ign "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Err "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "បាន​ទៅ​ប្រមូល​ %sB ក្នុង​ %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [កំពុង​ធ្វើការ​]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1479,46 +1472,62 @@ msgstr ""
 " '%s'\n"
 "ក្នុង​ដ្រាយ​ '%s' ហើយ​ចុច​បញ្ចូល\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1540,11 +1549,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "មិន​ស្គាល់​កំណត់​ត្រា​កញ្ចប់ !"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1604,196 +1613,198 @@ msgstr "នៅខាងលើ​សារ​នេះ​គឺ​សំខាន
 msgid "Merging available information"
 msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "បាន​បរាជ័យក្នុង​ការ​បង្កើត​បំពង់​"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "បាន​បរាជ័យក្នុង​ការ​ប្រតិបត្តិ gzip"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "ប័ណ្ណសារ​បាន​ខូច​"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar ឆេកសាំ​បាន​បរាជ័យ ប័ណ្ណសារ​បាន​ខូច"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "មិន​ស្គាល់​ប្រភេទ​បឋមកថា​ TAR  %u ដែលជា​សមាជិក​ %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "ហត្ថលេខា​ប័ណ្ណសា​រមិន​ត្រឹមត្រូវ​"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "កំហុស​ក្នុងការ​អានបឋមកថា​សមាជិក​ប័ណ្ណសារ"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, fuzzy, c-format
 msgid "Invalid archive member header %s"
 msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "ប័ណ្ណសារ ខ្លីពេក"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "បរាជ័យ​ក្នុងការ​អាន​បឋមកថា​ប័ណ្ណសារ"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "ទម្លាក់​ថ្នាំង​ដែល​បាន​ហៅ​លើ​ថ្នាំងដែល​នៅតែតភ្ជាប់"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "បរាជ័យ​ក្នុងការ​ដាក់ទីតាំង​ធាតុ​ដែលរាយប៉ាយ !"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "បរាជ័យ​ក្នុងការ​បម្រុងទុក​ការបង្វែរ"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "កំហុស​ខាងក្នុង នៅក្នុង AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "កំពុង​ព្យាយាម​សរសេរ​ជាន់​ពីលើ​ការបង្វែរ %s -> %s និង​ %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "ការបន្ថែម​ស្ទួន នៃការបង្វែរ​ %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​ស្ទួន​ %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "បរាជ័យ​ក្នុងការ​បិទឯកសារ %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "ផ្លូវ​ %s វែង​ពេក"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "កំពុង​ពន្លា​ %s ច្រើន​ជាង​ម្តង​"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "ថត​ %s ត្រូវបាន​បង្វែរ"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "កញ្ចប់ ​កំពុង​ព្យាយាម​សរសេរ​ទៅកាន់​គោលដៅ​បង្វែរ​ %s/%s"
 
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "ផ្លូវ​បង្វែរ វែងពេក"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "ថត​ %s ត្រូវ​បាន​ជំនួស​ដោយ​មិនមែន​ជា​ថត​"
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "បរាជ័យ​ក្នុងការ​ដាក់ថ្នាំង​នៅក្នុង​ធុង​រាយប៉ាយ​របស់វា"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "ផ្លូវ​វែង​ពេក"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "សរសេរ​ជាន់​លើកញ្ចប់ផ្គួផ្គង​ដោយ​គ្មាន​កំណែ​សម្រាប់ %s"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "ឯកសារ​ %s/%s សរសេរជាន់​ពីលើ​មួយ​ក្នុង​កញ្ចប់ %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "មិន​អាច​អាន​ %s បានឡើយ"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "មិន​អាច​ថ្លែង %s បានឡើយ"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "បរាជ័យក្នុងការយក %s ចេញ"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "មិន​អាច​បង្កើត​ %s បានឡើយ"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "បរាជ័យ​ក្នុងការថ្លែង %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "ថតព័ត៌មាន​ និង ពុម្ព ត្រូវការនៅលើ​ប្រព័ន្ធឯកសារ​ដូចគ្នា​"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "បរាជ័យ​ក្នុងការ​ផ្លាស់ប្ដូរទៅជា​ថតអ្នកគ្រប់គ្រង %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "កំហុស​ក្នុង​ការ ក្នុងការ​ទទួល​យក​ឈ្មោះកញ្ចប់"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "កំពុង​អាន​បញ្ជី​ឯកសារ"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1803,113 +1814,114 @@ msgstr ""
 "បរាជ័យ​ក្នុងការ​បើក​ឯកសារ​បញ្ជី​ '%sinfo/%s' ។ ប្រសិនបើ​អ្នក​មិន​អាច​ស្តារ​ឯកសារ​នេះបានទេ បន្ទាប់​មក​"
 "ធ្វើឲ្យវា​ទទេ ហើយ​ដំឡើង​កញ្ចប់ដែលកំណែ​ដូចគ្នា​ឡើងវិញភ្លាមៗ !"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "បរាជ័យ​ក្នុងការ​អាន​ឯកសារបញ្ជី​ %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "កំហុស​ខាងក្នុង ក្នុង​​ការ​ទទួល​យក​ថ្នាំង​"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "បរាជ័យ​ក្នុងការ​បើក​ឯកសារបង្វែរ​ %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 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
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "កំហុស​ខាងក្នុង​ ក្នុង​ការបន្ថែម​ការបង្វែរ​"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "ឃ្លាំងសម្ងាត់ pkg ត្រូវ​តែ​ចាប់ផ្តើម​ដំឡើងមុន"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "បរាជ័យ​ក្នុងការរកកញ្ចប់ ៖ បឋមកថា​ អុហ្វសិត %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "ផ្នែក​ ConfFile ខូច នៅក្នុង​ឯកសារ​ស្ថានភាព ។ អុហ្វសិត​ %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "កំហុស​ក្នុងការញែក​ MD5 ។ អុហ្វសិត​ %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "នេះ​ជាមិនមែនជា​ប័ណ្ណសារ​ DEB ​ត្រឹមត្រូវទេ បាត់បង់សមាជិក​ '%s'​"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 apt-inst/deb/debfile.cc:55
 #, fuzzy, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 msgstr "នេះជា​ប័ណ្ណសារ DEB មិន​ត្រឹមត្រូវ វាគ្មានសមាជិក '%s' ឬ '%s'"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "មិនអាច​ប្ដូរ​ទៅជា​ %s បានឡើយ"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "កំហុស​ខាងក្នុង ​មិន​អាច​កំណត់​ទីតាំង​សមាជិក​ %s បានឡើយ"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "បរាជ័យ​ក្នុងការដាក់ទិតាំង​ឯកសារ​ត្រួតពិនិត្យ​ដែលត្រឹមត្រូវ​"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "ឯកសារត្រួតពិនិត្យ​ដែលមិនអាច​ញែកបាន"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "អាចន​កំហុស​ពី​ដំណើរការ %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "បរាជ័យ​ក្នុងការថ្លែង"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "មិន​អាច​អាន​មូលដ្ឋាន​ទិន្នន័យ​​ស៊ីឌីរ៉ូម​​ %s បានឡើយ"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1917,375 +1929,380 @@ msgstr ""
 "សូម​ប្រើ​ apt-cdrom ដើម្បី​បង្កើត​ស៊ីឌី-រ៉ូម​នេះ​ ដែលបានរៀបចំ​តាម​ APT​ ។ apt-get ធ្វើ​ឲ្យ​ទាន់សម័យ ​មិន​"
 "ត្រូវ​បានប្រើ​ដើម្បី​បន្ថែម​ស៊ីឌី-រ៉ូមថ្មីឡើយ​"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "ស៊ីឌី-រ៉ូមខុស"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "មិនអាចអាន់ម៉ោន ស៊ីឌី​-រ៉ូម​ នៅ​​ក្នុង​ %s បានទេ វាអាចនៅតែប្រើបាន ។"
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "រក​ថាសមិ​ន​ឃើញ​ ។"
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "រកឯកសារ​មិន​ឃើញ​"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI មិនត្រឹមត្រូវ​ URIS មូលដ្ឋានមិនត្រូវ​ចាប់ផ្តើម​ជាមួយ​ // ឡើយ"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "កំពុង​ចូល​"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "មិន​អាច​កំណត់ឈ្មោះដែលត្រូវបង្ហាញ​បានឡើយ​"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "មិន​អាច​កំណត់ឈ្មោះមូលដ្ឋាន​បានឡើយ"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "ម៉ាស៊ីន​បម្រើបានបដិសេធ​ការតភ្ជាប់ ហើយ​ បាននិយាយ ៖ %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER បរាជ័យ​ ម៉ាស៊ីន​បម្រើបាន​​និយាយ ៖ %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS បានបរាជ័យ​ ម៉ាស៊ីន​បម្រើបាន​​និយាយ ៖ %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 "ម៉ាស៊ីន​បម្រើ​ប្រូកស៊ី​ត្រូវ​បាន​បញ្ជាក់​ ប៉ុន្តែ​គ្មាន​ស្គ្រីប​ចូល​ទេ Acquire::ftp::ProxyLogin គឺ ទទេ ។"
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "ពាក្យ​បញ្ជា​ស្គ្រីប​ចូល​ '%s' បានបរាជ័យ ម៉ាស៊ីន​បម្រើ​បាននិយាយ ៖ %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE បានបរាជ័យ​ ម៉ាស៊ីន​បម្រើ​បាននិយាយ​ ៖ %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "អស់ពេល​ក្នុងការតភ្ជាប់​"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បិទ​ការតភ្ជាប់​"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "ការអាន​មានកំហុស"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "ឆ្លើយតប​សតិ​បណ្តោះអាសន្ន​​អស់ចំណុះ ។"
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "ការបង្ខូច​ពិធីការ​"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "ការសរសេរ​មានកំហុស"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "មិន​អាច​បង្កើត​រន្ធបានឡើយ"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "មិន​អាច​តភ្ជាប់​​រន្ធទិន្នន័យ​បានឡើយ អស់​ពេល​ក្នុងការតភ្ជាប់​"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "មិនអាចតភ្ជាប់​​រន្ធអកម្ម​​បានឡើយ ។"
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo មិន​អាច​​ទទួល​យក​រន្ធ​សម្រាប់​ស្តាប់​​បានឡើយ"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "មិន​អាច​ចងរន្ធ​បានបានឡើយ​"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "មិនអាច​ស្ដាប់នៅលើរន្ធ​បានឡើយ"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "មិន​អាច​កំណត់​ឈ្មោះរបស់​រន្ធ​បានឡើយ"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "មិនអាច​ផ្ញើពាក្យ​បញ្ជា​ PORT បានឡើយ"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "មិន​ស្គាល់​អាសយដ្ឋាន​គ្រួសារ​ %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT បរាជ័យ​ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ ៖ %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័បានអស់ពេល​"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "មិន​អាច​ទៅ​ប្រមូល​យក​ឯកសារ​បានឡើយ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ​ '%s'"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "រន្ធ​ទិន្នន័យ​បាន​អស់​ពេល​"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "បរាជ័យក្នុងការ​ផ្ទេរ​ទិន្នន័យ ម៉ាស៊ីន​បម្រើ​បាន​និយាយ​ '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "សំណួរ​"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "មិន​អាច​ហៅ​ "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP ៖ %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "មិនអាច​ចាប់ផ្ដើម​ការតភ្ជាប់​​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ។"
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ការ​តភ្ជាប់​បានអស់​ពេល​"
 
-#: methods/connect.cc:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "កំពុង​តភ្ជាប់​ទៅកាន់ %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "មិន​អាច​ដោះស្រាយ​ '%s' បានឡើយ"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "ការ​ដោះស្រាយ​ភាព​បរាជ័យ​​បណ្តោះអាសន្ន '%s'"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក់ដែល​បាន​កើត​ឡើង​ '%s:%s' (%i)"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខា​​ល្អ ប៉ុន្តែ ​មិន​អាច​កំណត់​កូនសោ​ស្នាម​ម្រាមដៃ ?!"
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។"
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gpgv ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "ហត្ថលេខា​ខាងក្រោម​មិន​អាចផ្ទៀងផ្ទាត់បាន​ទេ​ ព្រោះកូនសោ​សាធារណៈមិន​អាច​ប្រើ​បាន​ ៖\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "កំពុង​រង់ចាំ​បឋមកថា"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "យកបន្ទាត់​បឋមកថា​តែមួយ​​ ដែលលើស %u តួអក្សរ"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "ជួរ​បឋមកថា​ខូច​"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើបឋមកថាចម្លើយតបមិនត្រឹមត្រូវ"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​​បឋមកថាប្រវែង​​​មាតិកា​មិនត្រឹមត្រូវ​"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​បឋមកថា​ជួរ​មាតិកា​មិន​ត្រឹមត្រូវ​"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូច​​​ជួរ​គាំទ្រ​"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "ជ្រើស​បាន​បរាជ័យ​"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "ការតភ្ជាប់​បាន​អស់ពេល​"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "ទិន្នន័យ​បឋមកថា​ខូច"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "កំហុស​ខាង​ក្នុង​"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "មិនអាច mmap ឯកសារទទេ​បានឡើយ"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "មិន​អាច​បង្កើត​ mmap នៃ​ %lu បៃបានឡើយ"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "មិន​អាចបើក​ %s បានឡើយ"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "មិន​អាច​ហៅ​ "
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "មិន​អាច​បង្កើត​ mmap នៃ​ %lu បៃបានឡើយ"
+
+#: apt-pkg/contrib/mmap.cc:311
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2314,93 +2331,93 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "មិន​បាន​​ទទួល​ស្គាល់​ប្រភេទ​អក្សរ​សង្ខេប ៖ '%c'"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "កំពុង​បើ​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ ប្លុក​ចាប់​ផ្តើម​​ដោយ​គ្មាន​ឈ្មោះ​ ។"
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ ស្លាក​ដែលបាន Malformed"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ តម្លៃ​ឥតបានការ​នៅ​ក្រៅ​"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដីបង្គាប់​អាចត្រូវបានធ្វើ​តែនៅលើ​កម្រិត​កំពូល​តែប៉ុណ្ណោះ"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ មាន​ការរួមបញ្ចូល​ដែលដាក់​រួមគ្នា​យ៉ាងច្រើន"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ បានរួម​បញ្ចូល​ពី​ទីនេះ​"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដី​បង្គាប់​ដែល​មិនបានគាំទ្រ '%s'"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដីបង្គាប់​អាចត្រូវបានធ្វើ​តែនៅលើ​កម្រិត​កំពូល​តែប៉ុណ្ណោះ"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ សារឥតបានការ​បន្ថែម ដែលនៅខាងចុង​ឯកសារ"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... កំហុស ​!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... ធ្វើរួច​"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "ជម្រើស​បន្ទាត់​ពាក្យបញ្ជា '%c' [from %s] មិនស្គាល់ឡើយ ។"
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "មិនយល់​ពី​ជម្រើស​បន្ទាត់​ពាក្យ​បញ្ជា %s ឡើយ"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "ជម្រើស​បន្ទាត់ពាក្យ​បញ្ជា​ %s មិនមែនជាប៊ូលីនទេ"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "ជម្រើស​ %s ត្រូវការ​អាគុយម៉ង់មួយ ។"
@@ -2410,344 +2427,362 @@ msgstr "ជម្រើស​ %s ត្រូវការ​អាគុយម�
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "ជម្រើស %s ៖ ការបញ្ជាក់​ធាតុ​កំណត់រចនាសម្ព័ន្ធត្រូវតែមាន =<val> មួយ ។"
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "ជម្រើស​ %s ត្រូវ​ការ​អាគុយម៉ង់​ចំនួន​គត់​ មិន​មែន​ '%s'"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "ជម្រើស​ '%s' វែងពេក"
 
-#: 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 "មិនបានយល់អំពី​ការស្គាល់​ %s ឡើយ សូមព្យាយមយក​ ពិត​ ​​​ឫ មិន​ពិត ។"
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "មិនអាច​ថ្លែង ចំណុចម៉ោន %s បានឡើយ"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "មិនអាច​ប្ដូរទៅ %s បានឡើយ"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "បរាជ័យក្នុងការ​ថ្លែង ស៊ីឌីរ៉ូម"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "មិន​ប្រើប្រាស់​ការចាក់សោ សម្រាប់តែឯកសារចាក់សោ​ដែលបានតែអានប៉ុណ្ណោះ %s"
 
-#: apt-pkg/contrib/fileutl.cc:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "មិន​អាច​បើក​ឯកសារ​ចាក់សោ​ %s បានឡើយ"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "មិនប្រើ​ការចាក់សោ សម្រាប់ nfs ឯកសារ​ចាក់សោដែលបានម៉ោន%s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "មិន​អាច​ចាក់សោ %s បានឡើយ"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ "
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ដំណើរការ​រង​ IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ​កម្មវិធី​បង្ហាប់ "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់"
 
-#: apt-pkg/contrib/fileutl.cc:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​"
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "ឃ្លាំង​កញ្ចប់​ទទេ​"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ត្រឹមត្រូវ​"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "ឯកសារ​ឃ្លាំងសម្ងាត់​​កញ្ចប់​ជាកំណែ​មិន​ត្រូវគ្នា​"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ត្រឹមត្រូវ​"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT នេះ មិនគាំទ្រ​ប្រព័ន្ធ​ ការធ្វើកំណែនេះទេ​ '%s'"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "ឃ្លាំង​សម្ងាត់​កញ្ចប់ត្រូវ​បានស្ថាបនា់​សម្រាប់ស្ថាបត្យករ​ខុស​ៗគ្នា​​"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "អាស្រ័យ​"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "អាស្រ័យជា​មុន"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "ផ្ដល់យោបល់​"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "ផ្តល់​អនុសាសន៍​"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "ប៉ះទង្គិច"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "ជំនួស​"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "លែង​ប្រើ"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "សំខាន់​"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "បាន​ទាមទារ"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "គំរូ"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "ស្រេចចិត្ត"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "បន្ថែម"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "កំពុងស្ថាបនា​មែកធាងភាពអាស្រ័យ"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "កំណែ​សាកល្បង​"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "ការបង្កើត​ភាពអាស្រ័យ​"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 #, fuzzy
 msgid "Reading state information"
 msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "បន្ទាត់ Malformed  %lu ក្នុង​ញ្ជី​ប្រភព​ %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "បន្ទាត់​ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist លែងប្រើ)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "កំពុង​បើក​ %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។"
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "បន្ទាត់​ Malformed  %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
 
-#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, 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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2758,25 +2793,18 @@ msgstr ""
 "ភាពអាស្រ័យជាមុន ។ ជាញឹកញាប់គឺ មិនត្រឹមត្រូវ ប៉ុន្តែ ប្រសិនបើអ្នក​ពិតជាចង់ធ្វើវា ធ្វើឲ្យជម្រើស APT::"
 "Force-LoopBreak សកម្ម ។"
 
-#: apt-pkg/packagemanager.cc:501
-#, 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
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "កញ្ចប់ %s ត្រូវការឲ្យដំឡើង ប៉ុន្តែ​ ខ្ញុំ​មិន​អាច​រក​ប័ណ្ណសារ​សម្រាប់​វា​បាន​ទេ​ ។"
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2784,11 +2812,11 @@ msgstr ""
 "កំហុស pkgProblemResolver::ដោះស្រាយ​សញ្ញាបញ្ឈប់​ដែលបានបង្កើត នេះ​ប្រហែលជា បង្កដោយកញ្ចប់​"
 "ដែលបាន​ទុក ។"
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។"
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2796,233 +2824,195 @@ msgid ""
 msgstr ""
 "ឯកសារ​លិបិក្រម​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​​ទាញ​យក ​ពួកវាត្រូវបាន​មិន​អើពើ​ ឬ ប្រើ​​ឯកសារ​ចាស់​ជំនួសវិញ ​​។"
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។"
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "ថត​ប័ណ្ណសារ​ %spartial គឺ​បាត់បង់​ ។"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "កំពុង​ទៅ​យក​ឯកសារ %li នៃ %li (នៅសល់ %s)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "កំពុង​ទៅយក​ឯកសារ %li នៃ %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ្ជា​វិធីសាស្ត្រ %s ឡើយ ។"
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។"
 
-#: apt-pkg/init.cc:147
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "មិន​គាំទ្រ​ប្រព័ន្ធ​កញ្ចប់'%s' ឡើយ"
 
-#: apt-pkg/init.cc:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "មិនអាច​កំណត់​ប្រភេទ​ប្រព័ន្ធ​កញ្ចប់​ដែល​សមរម្យ​បានឡើយ"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "មិនអាច​ថ្លែង %s បានឡើយ ។"
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "អ្នកត្រូវតែដាក់ 'ប្រភព' URIs មួយចំនួន​នៅក្នុង sources.list របស់អ្នក"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "បញ្ជី​កញ្ចប់​ ឬ ឯកសារ​ស្ថានភាព​មិន​អាចត្រូវបាន​​ញែក ​​ឬ ត្រូវបាន​បើកបានឡើយ​​ ។"
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "អ្នកប្រហែលជា​ចង់ភាពទាន់សម័យ apt-get ដើម្បី​កែ​បញ្ហា​ទាំងនេះ"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។"
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "កំណត់ត្រា​មិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារចំណង់ចំណូលចិត្ត មិនមាន​បឋមកថា​កញ្ចប់ទេ"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "មិន​បាន​យល់​ពី​ប្រភេទ​ម្ជុល %s ឡើយ"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "គ្មាន​អទិភាព (ឬ សូន្យ​) បានបញ្ជាក់​សម្រាប់​ម្ជុល​ទេ"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "ឃ្លាំងសម្ងាត់​មិន​ត្រូវ​គ្នា​នឹង ប្រព័ន្ធ ធ្វើកំណែ"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "កំហុស​បាន​កើត​ឡើង​​ ខណៈ​ពេល​កំពុង​ដំណើរការ​ %s (កញ្ចប់​ថ្មី​)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "កំហុស​បាន​កើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (ប្រើ​កញ្ចប់​១​)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "កំហុស​បានកើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ​​​ឯកសារ​ថ្មី​១)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "កំហុស​បាន​កើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (ប្រើកញ្ចប់២)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "កំហុស​បានកើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ​​​ឯកសារ​ថ្មី​១)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "កំហុស​បានកើត​ឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ១ថ្មី​)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "កំហុស​បាន​កើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (ប្រើកញ្ចប់​៣)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "កំហុស​បានកើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ​​​ឯកសារ​ថ្មី​១)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​  APT នេះ​ឆបគ្នា​​  ។"
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
 
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​%s (ផ្តល់​ឯកសារ​ប្រមូល​ផ្តុំ)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ"
 
-#: apt-pkg/pkgcachegen.cc:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s (%s -> %s) ។"
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum មិន​ផ្គួផ្គង​"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum មិន​ផ្គួផ្គង​"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3030,12 +3020,12 @@ msgid ""
 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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3044,7 +3034,7 @@ msgstr ""
 "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ "
 "(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)"
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3052,47 +3042,47 @@ msgid ""
 msgstr ""
 "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បានទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។"
 
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។"
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "ប្លុក​ក្រុមហ៊ុន​លក់​ %s គ្មាន​ស្នាម​ផ្តិត​ម្រាម​ដៃ"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3101,64 +3091,64 @@ msgstr ""
 "ការប្រើប្រាស់​ចំណុចម៉ោន​ ស៊ីឌី​-រ៉ូម​ %s\n"
 "កំពុង​ម៉ោន​ស៊ីឌី-រ៉ូម​\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "កំពុង​ធ្វើអត្តសញ្ញាណនា​.. "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "បានទុក​ស្លាក ៖ %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "មិនកំពុងម៉ោន ស៊ីឌី​-រ៉ូម​ ទេ..."
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "ប្រើប្រាស់ចំណុចម៉ោន​ ស៊ីឌី​-រ៉ូម​ %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "ការមិនម៉ោន​ ស៊ីឌី-រ៉ូម​\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "កំពុង​រង់ចាំឌីស​...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "កំពុង​ម៉ោន​ ស៊ីឌី​-រ៉ូម​...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "កំពុង​ស្កេន​ឌីស​សម្រាប់​​ឯកសារ​លិបិក្រម​..\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, fuzzy, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr "បានរកឃើញ លិបិក្រម​កញ្ចប់ %i  លិបិក្រម​ប្រភព%i  និង ហត្ថលេខា %i \n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
 msgstr "បានទុក​ស្លាក ៖ %s \n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "នោះមិនមែនជាឈ្មោះត្រឹមត្រូវទេ សូមព្យាយាម​ម្ដងទៀត ។\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3167,293 +3157,368 @@ msgstr ""
 "ឌីស​នេះ​ត្រូវ​បាន​ហៅ​ ៖ \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "កំពុង​ចម្លង​បញ្ជី​កញ្ចប់..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "កំពុងសរសេរ​បញ្ជី​ប្រភព​ថ្មី\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "ធាតុបញ្ចូល​បញ្ជីប្រភព​សម្រាប់​ឌីស​នេះគឺ ៖\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "បានសរសេរ %i កំណត់ត្រា ។\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់ ។\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "បានសរសេរ​ %i កំណត់ត្រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​\n"
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "កំពុង​បើ​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "MD5Sum មិន​ផ្គួផ្គង​"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "រក​មិន​ឃើញ​ការ​ចេញ​ផ្សាយ​ '%s' សម្រាប់​ '%s' ឡើយ"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "បាន​ដំឡើង %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "កំពុង​កំណត់​រចនា​សម្ព័ន្ធ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "កំពុង​យក %s ចេញ"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "កំពុងរៀបចំ​ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "កំពុង​ស្រាយ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "កំពុងរៀបចំ​កំណត់រចនាសម្ព័ន្ធ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "បាន​ដំឡើង %s"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "កំពុងរៀបចំដើម្បី​ការយក​ចេញ​នៃ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "បាន​យក %s ចេញ"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង​ស្រុង"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, 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:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "បាន​បិទ​ការ​តភ្ជាប់​មុន​ពេល"
 
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "កម្មវិធី​ពន្លា"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "កំហុស​បាន​កើត​ឡើង​​ ខណៈ​ពេល​កំពុង​ដំណើរការ​ %s (កញ្ចប់​ថ្មី​)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "កំហុស​បាន​កើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (ប្រើ​កញ្ចប់​១​)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "កំហុស​បានកើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ​​​ឯកសារ​ថ្មី​១)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "កំហុស​បាន​កើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (ប្រើកញ្ចប់២)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "កំហុស​បានកើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ​​​ឯកសារ​ថ្មី​១)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "កំហុស​បានកើត​ឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ១ថ្មី​)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "កំហុស​បាន​កើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (ប្រើកញ្ចប់​៣)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "កំហុស​បានកើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ​​​ឯកសារ​ថ្មី​១)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​%s (ផ្តល់​ឯកសារ​ប្រមូល​ផ្តុំ)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "កំហុស​ខាងក្នុង មិន​អាចដាក់ទីតាំង​ឲ្យ​សមាជិក​បានឡើយ"
 
diff --git a/po/ko.po b/po/ko.po
index 6d6b38a59..2cc65549a 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -15,149 +15,150 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "%s 패키지의 %s 버전의 의존성이 맞지 않습니다:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "전체 패키지 이름 : "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "전체 패키지 구조: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  일반 패키지: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  순수 가상 패키지: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  단일 가상 패키지: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  혼합 가상 패키지: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  빠짐: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "개별 버전 전체: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "개별 설명 전체: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "전체 의존성: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "전체 버전/파일 관계: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "전체 설명/파일 관계: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "전체 제공 매핑: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "전체 패턴 문자열: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "전체 의존성 버전 용량: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "전체 빈 용량: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "차지하는 전체 용량: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "패키지 파일 %s 파일이 동기화되지 않았습니다."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "패키지가 없습니다"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "최소 한 개의 검색어를 지정해야 합니다"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "%s 패키지를 찾을 수 없습니다"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "패키지 파일:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "캐시가 동기화되지 않았습니다. 패키지 파일을 상호 참조할 수 없습니다"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "핀 패키지:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(없음)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  설치: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  후보: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(없음)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  패키지 핀: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  버전 테이블:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -231,28 +232,28 @@ msgstr ""
 "  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
 "좀 더 자세한 정보는 apt-cache(8) 및 apt.conf(5) 매뉴얼 페이지를 보십시오.\n"
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "드라이브에 디스크를 넣고 Enter를 누르십시오"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "현재 갖고 있는 다른 CD에도 이 과정을 반복하십시오."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "인수가 두 개가 아닙니다"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -280,12 +281,12 @@ msgstr ""
 "  -c=? 해당 설정 파일을 읽습니다\n"
 "  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s은(는) 올바른 DEB 패키지가 아닙니다."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -309,40 +310,40 @@ msgstr ""
 "  -c=? 설정 파일을 읽습니다\n"
 "  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "%s에 쓸 수 없습니다"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "debconf 버전을 알 수 없습니다. debconf가 설치되었습니까?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "패키지 확장 목록이 너무 깁니다"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "소스 확장 목록이 너무 깁니다"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "컨텐츠 파일에 헤더를 쓰는데 오류가 발생했습니다"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "%s 컨텐츠를 처리하는데 오류가 발생했습니다"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -423,26 +424,26 @@ msgstr ""
 "  -c=?  이 설정 파일을 읽습니다\n"
 "  -o=?  임의의 옵션을 설정합니다"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "맞는 패키지가 없습니다"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "`%s' 패키지 파일 그룹에 몇몇 파일이 빠졌습니다"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "DB가 망가졌습니다. 파일 이름을 %s.old로 바꿉니다"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB가 오래되었습니다. %s의 업그레이드를 시도합니다"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -450,113 +451,113 @@ msgstr ""
 "DB 형식이 잘못되었습니다. APT 예전 버전에서 업그레이드했다면, 데이터베이스를 "
 "지우고 다시 만드십시오."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "DB 파일, %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s의 정보를 읽는데 실패했습니다"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "아카이브에 컨트롤 기록이 없습니다"
 
 # FIXME: 왠 커서??
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "커서를 가져올 수 없습니다"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "경고: %s 디렉터리를 읽을 수 없습니다\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "경고: %s의 정보를 읽을 수 없습니다\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "오류: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "경고: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "오류: 다음 파일에 적용하는데 오류가 발생했습니다: "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "%s의 경로를 알아내는데 실패했습니다"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "트리에서 이동이 실패했습니다"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "%s 파일을 여는데 실패했습니다"
 
 # FIXME: ??
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " 링크 %s [%s] 없애기\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "%s 파일에 readlink하는데 실패했습니다"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "%s 파일을 지우는데 실패했습니다"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** %s 파일을 %s에 링크하는데 실패했습니다"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "아카이브에 패키지 필드가 없습니다"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s에는 override 항목이 없습니다\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: 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:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s에는 source override 항목이 없습니다\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s에는 binary override 항목이 없습니다\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - 메모리를 할당하는데 실패했습니다"
 
@@ -566,18 +567,18 @@ msgid "Unable to open %s"
 msgstr "%s 열 수 없습니다"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "override %s의 %lu번 줄 #2가 잘못되었습니다"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "override %s의 %lu번 줄 #3이 잘못되었습니다"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -585,63 +586,51 @@ msgstr "override %s의 %lu번 줄 #3이 잘못되었습니다"
 msgid "Failed to read the override file %s"
 msgstr "%s override 파일을 읽는데 실패했습니다"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "'%s' 압축 알고리즘을 알 수 없습니다"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "압축된 출력물 %s에는 압축 세트가 필요합니다"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "하위 프로세스에 대한 IPC 파이프를 만드는데 실패했습니다"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "FILE*를 만드는데 실패했습니다"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "fork하는데 실패했습니다"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "압축 하위 프로세스"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "내부 오류, %s 만드는데 실패했습니다"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "하위 프로세스 IPC를 만드는데 실패했습니다"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "다음 압축 프로그램을 실행하는데 실패했습니다: "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "압축 해제 프로그램"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "하위 프로세스/파일에 입출력하는데 실패했습니다"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "MD5를 계산하는 동안 읽는데 실패했습니다"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "%s의 링크를 해제하는데 문제가 있습니다"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다"
@@ -650,75 +639,79 @@ msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "정규식 컴파일 오류 - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "다음 패키지의 의존성이 맞지 않습니다:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "하지만 %s 패키지를 설치했습니다"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "하지만 %s 패키지를 설치할 것입니다"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "하지만 설치할 수 없습니다"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "하지만 가상 패키지입니다"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "하지만 설치하지 않았습니다"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "하지만 %s 패키지를 설치하지 않을 것입니다"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " 혹은"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "다음 새 패키지를 설치할 것입니다:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "다음 패키지를 지울 것입니다:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "다음 패키지를 과거 버전으로 유지합니다:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "다음 패키지를 업그레이드할 것입니다:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "다음 패키지를 다운그레이드할 것입니다:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "고정되었던 다음 패키지를 바꿀 것입니다:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (%s때문에) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -726,59 +719,59 @@ msgstr ""
 "경고: 꼭 필요한 다음 패키지를 지우게 됩니다.\n"
 "무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu개 업그레이드, %lu개 새로 설치, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu개 다시 설치, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu개 업그레이드, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "주의, 작업 '%2$s'에 대해 '%1$s'을(를) 선택합니다\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "주의, 정규식 '%2$s'에 대해 '%1$s'을(를) 선택합니다\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "%s 패키지는 다음이 제공하는 가상 패키지입니다:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [설치함]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr "[후보 버전 아님]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "설치할 패키지를 하나 분명히 지정해야 합니다."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -789,128 +782,128 @@ msgstr ""
 "해당 패키지가 누락되었거나 지워졌다는 뜻입니다. 아니면 또 다른 곳에서\n"
 "패키지를 받아와야 하는 경우일 수도 있습니다.\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "하지만 다음 패키지가 대체합니다:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "'%s' 패키지는 설치할 수 있는 후보가 없습니다"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "'%s' 패키지와 같은 가상 패키지는 제거할 수 없습니다\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "주의, '%2$s' 대신에 '%1$s' 패키지를 선택합니다\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "%s 패키지를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "%s 패키지를 건너 뜁니다. 설치되지 않았고 업그레이드만 요청합니다.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "%s 패키지를 다시 설치하는 건 불가능합니다. 다운로드할 수 없습니다.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s 패키지는 이미 최신 버전입니다.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 패키지 수동설치로 지정합니다.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "의존성을 바로잡는 중입니다..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " 실패."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "의존성을 바로잡을 수 없습니다"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "업그레이드 집합을 최소화할 수 없습니다"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " 완료"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 "이 상황을 바로잡으려면 'apt-get -f install'을 실행해야 할 수도 있습니다."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "경고: 다음 패키지를 인증할 수 없습니다!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "인증 경고를 무시합니다.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "확인하지 않고 패키지를 설치하시겠습니까 [y/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "인증할 수 없는 패키지가 있습니다"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "내부 오류. 망가진 패키지에서 InstallPackages를 호출했습니다!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "패키지를 제거해야 하지만 제거가 금지되어 있습니다."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "이상하게도 크기가 서로 다릅니다. apt@packages.debian.org로 이메일을 보내주십"
@@ -918,55 +911,55 @@ 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of 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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "%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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "이 작업 후 %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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n"
 
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s 안에 충분한 여유 공간이 없습니다."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 "
 "아닙니다."
 
 # 입력을 받아야 한다.  한글 입력을 못 할 수 있으므로 원문 그대로 사용.
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -977,28 +970,28 @@ msgstr ""
 "계속하시려면 다음 문구를 입력하십시오: '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "중단."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "계속 하시겠습니까 [Y/n]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s 파일을 받는데 실패했습니다  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "일부 파일을 받는데 실패했습니다"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1006,19 +999,19 @@ msgstr ""
 "아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-"
 "missing 옵션을 줘서 실행해야 할 것입니다."
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "빠진 패키지를 바로잡을 수 없습니다."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "설치를 중단합니다."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1029,35 +1022,35 @@ msgstr[0] ""
 "다음 패키지는 패키지의 파일을 모두 다른 패키지가\n"
 "덮어썼기 때문에 사라졌습니다:"
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "주의: dpkg에서 자동으로 의도적으로 수행했습니다."
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "'%2$s' 패키지의 '%1$s' 대상 릴리스는 없으므로 무시합니다."
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "소스 패키지로 '%s'을(를) '%s' 대신 선택합니다\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "'%2$s' 패키지의 '%1$s' 버전은 없으므로 무시합니다."
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "update 명령은 인수를 받지 않습니다"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1075,15 +1068,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "이 상황을 해결하는데 다음 정보가 도움이 될 수도 있습니다:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1091,27 +1084,27 @@ msgid_plural ""
 "required:"
 msgstr[0] "다음 패키지가 자동으로 설치되었지만 더 이상 필요하지 않습니다:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, 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개가 자동으로 설치되었지만 더 이상 필요하지 않습니다.\n"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "이들을 지우려면 'apt-get autoremove'를 사용하십시오."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "다음을 바로잡으려면 'apt-get -f install'을 실행해 보십시오:"
 
 # FIXME: specify a solution?  무슨 솔루션?
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1119,7 +1112,7 @@ msgstr ""
 "의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 "
 "(아니면 해결 방법을 지정하십시오)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1130,73 +1123,73 @@ msgstr ""
 "불안정 배포판을 사용해서 일부 필요한 패키지를 아직 만들지 않았거나,\n"
 "아직 Incoming에서 나오지 않은 경우일 수도 있습니다."
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "망가진 패키지"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "다음 패키지를 더 설치할 것입니다:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "제안하는 패키지:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "추천하는 패키지:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s 패키지를 찾을 수 없습니다"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s 패키지는 수동설치로 지정합니다.\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "업그레이드를 계산하는 중입니다... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "실패"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "완료"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "다운로드 디렉터리를 잠글 수 없습니다"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
 
-#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s의 소스 패키지를 찾을 수 없습니다"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1205,7 +1198,7 @@ msgstr ""
 "알림: '%s' 패키징은 다음 '%s' 버전 컨트롤 시스템에서 관리합니다:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1216,85 +1209,85 @@ msgstr ""
 "다음과 같이 하십시오:\n"
 "bzr get %s\n"
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s 소스를 가져옵니다\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "일부 아카이브를 가져오는데 실패했습니다."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
 
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "압축 풀기 명령 '%s' 실패.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
 
-#: cmdline/apt-get.cc:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "빌드 명령 '%s' 실패.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "하위 프로세스가 실패했습니다"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다"
 
-#: cmdline/apt-get.cc:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다"
 
-#: cmdline/apt-get.cc:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 패키지에 빌드 의존성이 없습니다.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1303,7 +1296,7 @@ msgstr ""
 "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
 "다"
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1312,14 +1305,14 @@ msgstr ""
 "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
 "다"
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1328,7 +1321,7 @@ msgstr ""
 "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버"
 "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1337,30 +1330,30 @@ msgstr ""
 "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
 "다"
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: %3$s"
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "빌드 의존성을 처리하는데 실패했습니다"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s(%s)에 연결하는 중입니다"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "지원하는 모듈:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1448,7 +1441,7 @@ msgstr ""
 "apt.conf(5) 매뉴얼 페이지를 보십시오.\n"
 "                       이 APT는 Super Cow Powers로 무장했습니다.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1460,33 +1453,33 @@ msgstr ""
 "      또 잠금 기능을 사용하지 않는 상태이므로, 현재 상황에 의존하지\n"
 "      않도록 하십시오!"
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "기존 "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "받기:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "무시"
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "오류 "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "내려받기 %s바이트, 소요시간 %s (%s바이트/초)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [작업중]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1497,46 +1490,62 @@ msgstr ""
 "디스크를 넣고 enter를 누르십시오\n"
 " '%1$s'\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "하지만 설치하지 않았습니다"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s 패키지 수동설치로 지정합니다.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s 패키지는 수동설치로 지정합니다.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s 패키지는 이미 최신 버전입니다.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s 패키지는 이미 최신 버전입니다.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s 패키지 수동설치로 지정합니다.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "%s 파일을 여는데 실패했습니다"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1558,11 +1567,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "알 수 없는 패키지 기록!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1622,196 +1631,198 @@ msgstr "오류만 중요합니다. 이 오류를 고친 다음에 설치(I)를 �
 msgid "Merging available information"
 msgstr "이용 가능 패키지 정보를 합칩니다"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "파이프 만들기가 실패했습니다"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "gzip 실행이 실패했습니다"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "아카이브가 손상되었습니다"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "tar 체크섬 실패, 아카이브가 손상되었습니다"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "알 수 없는 TAR 헤더 타입 %u, 멤버 %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "아카이브 서명이 틀렸습니다"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "아카이브 멤버 헤더를 읽는데 오류가 발생했습니다"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "아카이브 멤버 헤더 %s이(가) 잘못되었습니다"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "아카이브 멤버 헤더가 잘못되었습니다"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "아카이브 길이가 너무 짧습니다"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "아카이브 헤더를 읽는데 실패했습니다"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "DropNode가 아직 연결되어 있는 노드에 대해 호출되었습니다"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "해시 항목을 찾는데 실패했습니다"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "diversion을 할당하는데 실패했습니다"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "AddDiversion에서 내부 오류"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "전환된 파일을 덮어 쓰려고 합니다 (%s -> %s 및 %s/%s)"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "전환된 파일을 두 번 추가합니다 (%s -> %s)"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "%s/%s 설정 파일이 중복되었습니다"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "%s 파일을 쓰는데 실패했습니다"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "%s 파일을 닫는데 실패했습니다"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "경로 %s이(가) 너무 깁니다"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s을(를) 두 번 이상 풀었습니다"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "%s 디렉터리가 전환되었습니다"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "이 패키지에서 전환된 대상에 쓰려고 합니다 (%s/%s)"
 
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "전환하는 경로가 너무 깁니다"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "%s 디렉터리를 디렉터리가 아닌 파일로 덮어쓰려고 합니다"
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "해시 버킷에서 노드를 찾는데 실패했습니다"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "경로가 너무 깁니다"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "덮어 쓰는 패키지가 %s 패키지의 어떤 버전과도 맞지 않습니다"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "%s/%s 파일은 %s 패키지에 있는 파일을 덮어 씁니다"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s을(를) 읽을 수 없습니다"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s의 정보를 읽을 수 없습니다"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "%s을(를) 지우는데 실패했습니다"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "%s을(를) 만들 수 없습니다"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "%sinfo의 정보를 읽는데 실패했습니다"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "정보 디렉토리와 임시 디렉토리는 같은 파일 시스템에 있어야 합니다"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "패키지 목록을 읽는 중입니다"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "관리 디렉토리를 %sinfo로 바꾸는데 실패했습니다"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "패키지 이름을 가져오는데 내부 오류"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "파일 목록을 읽는 중입니다"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1821,113 +1832,114 @@ msgstr ""
 "목록 파일 '%sinfo/%s' 파일을 여는데 실패했습니다. 이 파일을 복구할 수 없다면 "
 "비워 놓고 같은 버전의 패키지를 다시 설치하십시오!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "목록 파일 %sinfo/%s 파일을 읽는데 실패했습니다"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "노드를 얻어 오는데 내부 오류"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "전환 파일 %sdiversions를 여는데 실패했습니다"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 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
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "전환 파일에 잘못된 줄이 있습니다: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "diversion을 추가하는데 내부 오류"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "패키지 캐시를 먼저 초기화해야 합니다"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "패키지를 찾는데 실패했습니다: 헤더, 오프셋 %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "status 파일에서 ConfFile 섹션이 잘못되었습니다. 오프셋 %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "MD5 분석에 오류가 있습니다. 오프셋 %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "올바른 DEB 아카이브가 아닙니다. '%s' 멤버가 없습니다"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 "올바른 DEB 아카이브가 아닙니다. '%s'나 '%s' 혹은 '%s' 멤버가 없습니다"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "%s 디렉토리로 이동할 수 없습니다"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "내부 오류, %s 멤버를 찾을 수 없습니다"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "올바른 control 파일을 찾는데 실패했습니다"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "control 파일을 파싱할 수 없습니다"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "%s에 대한 파이프를 열 수 없습니다"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "%s 프로세스에서 읽는데 오류가 발생했습니다"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "파일 정보를 읽는데 실패했습니다"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "파일 변경 시각을 설정하는데 실패했습니다"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "CD-ROM 데이터베이스 %s을(를) 읽을 수 없습니다"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1935,56 +1947,56 @@ msgstr ""
 "이 CD를 APT에서 인식하려면 apt-cdrom을 사용하십시오.  apt-get update로는 새 "
 "CD를 추가할 수 없습니다."
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "잘못된 CD"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "%s 안의 CD-ROM을 마운트 해제할 수 없습니다. 사용 중일 것입니다."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "디스크가 없습니다."
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "파일이 없습니다"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI가 틀렸습니다. 로컬 URI는 //로 시작해야 합니다."
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "로그인하는 중입니다"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "상대방의 이름을 알 수 없습니다"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "로컬 이름을 알 수 없습니다"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "서버에서 다음과 같이 연결을 거부했습니다: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER 실패, 서버에서는: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS 실패, 서버에서는: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -1992,302 +2004,307 @@ msgstr ""
 "프록시 서버를 지정했지만 로그인 스크립트가 없습니다. Acquire::ftp::"
 "ProxyLogin 값이 비어 있습니다."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "로그인 스크립트 명령 '%s' 실패, 서버에서는: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE 실패, 서버에서는: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "연결 시간 초과"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "서버에서 연결을 닫았습니다"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "읽기 오류"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "응답이 버퍼 크기를 넘어갔습니다."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "프로토콜이 틀렸습니다"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "쓰기 오류"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "소켓을 만들 수 없습니다"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "데이터 소켓을 연결할 수 없습니다. 연결 시간이 초과되었습니다"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "수동(passive) 소켓을 연결할 수 없습니다."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo에서 소켓에 listen할 수 없습니다"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "소켓을 bind할 수 없습니다"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "소켓에 listen할 수 없습니다"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "소켓의 이름을 알아낼 수 없습니다"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "PORT 명령을 보낼 수 없습니다"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "주소 %u의 종류(AF_*)를 알 수 없습니다"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT 실패, 서버에서는: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "데이터 소켓 연결 시간 초과"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "연결을 받을 수 없습니다"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "파일 해싱에 문제가 있습니다"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "파일을 가져올 수 없습니다. 서버 왈, '%s'"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "데이터 소켓에 제한 시간이 초과했습니다"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "데이터 전송 실패, 서버에서는: %s"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "질의"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "다음을 실행할 수 없습니다: "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "%s(%s)에 연결하는 중입니다"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "%s:%s에 연결을 초기화할 수 없습니다 (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "%s:%s에 연결할 수 없습니다 (%s). 연결 제한 시간이 초과했습니다"
 
-#: methods/connect.cc:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s에 연결하는 중입니다"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "'%s'의 주소를 알아낼 수 없습니다"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "'%s'의 주소를 알아내는데 임시로 실패했습니다"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생했습니다 (%i - %s)"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "%s:%s에 연결할 수 없습니다:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "내부 오류: 서명은 올바르지만 키 핑거프린트를 확인할 수 없습니다?!"
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "최소한 하나 이상의 서명이 잘못되었습니다."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "서명을 확인하는 'gpgv' 프로그램을 실행할 수 없습니다. (gpgv를 설치했습니까?)"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "gpgv 실행 도중 알 수 없는 오류 발생"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "다음 서명이 올바르지 않습니다:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "다음 서명들은 공개키가 없기 때문에 인증할 수 없습니다:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "헤더를 기다리는 중입니다"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "헤더 줄이 잘못되었습니다"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "데이터 형식을 알 수 없습니다"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "select가 실패했습니다"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "연결 시간이 초과했습니다"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "출력 파일에 쓰는데 오류가 발생했습니다"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "파일에 쓰는데 오류가 발생했습니다"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "해당 파일에 쓰는데 오류가 발생했습니다"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "서버에서 읽고 연결을 닫는데 오류가 발생했습니다"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "서버에서 읽는데 오류가 발생했습니다"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "파일을 자르는데 실패했습니다"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "헤더 데이터가 잘못되었습니다"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "연결이 실패했습니다"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "내부 오류"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "빈 파일에 메모리 매핑할 수 없습니다"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "%i 파일 디스크립터를 복사할 수 없습니다"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "%lu바이트를 메모리 매핑할 수 없습니다"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "mmap을 닫을 수 없습니다"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "mmap을 동기화할 수 없습니다"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "%lu바이트를 메모리 매핑할 수 없습니다"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "파일을 자르는데 실패했습니다"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2296,14 +2313,14 @@ msgstr ""
 "동적 mmap이 한계를 벗어났습니다. APT::Cache-Limit의 크기를 높이십시오. 현재 "
 "값: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr "mmap 크기를 늘릴 수 없습니다. 이미 %lu 바이트 한계에 도달했습니다."
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2333,93 +2350,93 @@ msgstr "%li분 %li초"
 msgid "%lis"
 msgstr "%li초"
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "선택한 %s이(가) 없습니다"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "이 타입 줄임말을 알 수 없습니다: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "설정 파일 %s 파일을 여는 중입니다"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "문법 오류 %s:%u: 블럭이 이름으로 시작하지 않습니다."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "문법 오류 %s:%u: 태그의 형식이 잘못되었습니다"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "문법 오류 %s:%u: 값 뒤에 쓰레기 데이터가 더 있습니다"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "문법 오류 %s:%u: 지시어는 맨 위 단계에서만 쓸 수 있습니다"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "문법 오류 %s:%u: include가 너무 많이 겹쳐 있습니다"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "문법 오류 %s:%u: 여기서 include됩니다"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "문법 오류 %s:%u: 지원하지 않는 지시어 '%s'"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr "문법 오류 %s:%u: clear 지시어는 인수로 option 트리를 지정해야 합니다"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... 오류!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... 완료"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "명령행 옵션 '%c' 옵션을 [%s에서] 알 수 없습니다."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "명령행 옵션 '%s' 옵션을 알 수 없습니다"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "명령행 옵션 '%s' 옵션은 불리언이 아닙니다"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "%s 옵션에는 인수가 필요합니다."
@@ -2429,337 +2446,350 @@ msgstr "%s 옵션에는 인수가 필요합니다."
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "%s 옵션: 설정 항목 지정은 =<값> 형태여야 합니다."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "%s 옵션에는 정수 인수가 필요합니다. '%s'이(가) 아닙니다"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "'%s' 옵션이 너무 깁니다"
 
-#: 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 "%s 센스를 이해할 수 없습니다. 참 아니면 거짓으로 해 보십시오."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "잘못된 작업 %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "마운트 위치 %s의 정보를 읽을 수 없습니다"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "%s 디렉토리로 이동할 수 없습니다"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "CD-ROM의 정보를 읽을 수 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "읽기 전용 잠금 파일 %s에 대해 잠금을 사용하지 않습니다"
 
-#: apt-pkg/contrib/fileutl.cc:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "잠금 파일 %s 파일을 열 수 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "NFS로 마운트된 잠금 파일 %s에 대해 잠금을 사용하지 않습니다"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "%s 잠금 파일을 얻을 수 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다."
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "하위 프로세스 %s 프로세스가 %u번 시그널을 받았습니다."
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다"
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s 파일을 열 수 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "%d 파일 디스크립터를 열 수 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "하위 프로세스 IPC를 만드는데 실패했습니다"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "다음 압축 프로그램을 실행하는데 실패했습니다: "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다"
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "%s gzip 파일을 닫는데 문제가 있습니다"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "%s 파일을 닫는데 문제가 있습니다"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "%s 파일을 %s(으)로 이름을 바꾸는데 문제가 있습니다"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "%s 파일을 삭제하는데 문제가 있습니다"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "파일을 동기화하는데 문제가 있습니다"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "패키지 캐시가 비어 있습니다"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "패키지 캐시 파일이 손상되었습니다"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "패키지 캐시 파일이 호환되지 않는 버전입니다"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "패키지 캐시 파일이 손상되었습니다"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "이 APT는 '%s' 버전 시스템을 지원하지 않습니다"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "패키지 캐시가 다른 아키텍쳐용입니다."
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "의존"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "미리의존"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "제안"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "추천"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "충돌"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "대체"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "없앰"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "망가뜨림"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "향상"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "중요"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "필수"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "표준"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "옵션"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "별도"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "의존성 트리를 만드는 중입니다"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "후보 버전"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "의존성 만들기"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "상태 정보를 읽는 중입니다"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "상태파일 %s 여는데 실패했습니다"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "임시 상태파일 %s 쓰는데 실패했습니다"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 파싱 불가)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 너무 짧음)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 대입이 아님)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 키가 없음)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] %4$s 키에 값이 없음)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "%s 파일을 여는 중입니다"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2768,7 +2798,12 @@ msgstr ""
 "'%s'에 대해 즉시 설정을 할 수 없습니다. 자세한 설명은 man 5 apt.conf 페이지에"
 "서 APT::Immediate-Configure 항목을 보십시오. (%d)"
 
-#: apt-pkg/packagemanager.cc:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "'%s' 파일을 열 수 없습니다"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2779,28 +2814,19 @@ msgstr ""
 "잠깐 제거해야 합니다. 이 패키지를 제거하는 건 좋지 않지만, 정말 지우려면 "
 "APT::Force-LoopBreak 옵션을 켜십시오."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"이미 압축이 풀린 '%s' 패키지에 대해 즉시 설정을 할 수 없습니다. 자세한 설명"
-"은 man 5 apt.conf 페이지에서 APT::Immediate-Configure 항목을 보십시오."
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 "%s 패키지를 다시 설치해야 하지만, 이 패키지의 아카이브를 찾을 수 없습니다."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2808,11 +2834,11 @@ msgstr ""
 "오류, pkgProblemResolver::Resolve가 망가졌습니다. 고정 패키지때문에 발생할 수"
 "도 있습니다."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다."
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2821,232 +2847,194 @@ msgstr ""
 "일부 인덱스 파일을 다운로드하는데 실패했습니다. 해당 파일을 무시하거나 과거"
 "의 버전을 대신 사용합니다."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "목록 디렉터리 %spartial이 빠졌습니다."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "아카이브 디렉터리 %spartial이 빠졌습니다."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "%s 디렉터리를 잠글 수 없습니다"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "파일 받아오는 중: %2$li 중 %1$li (%3$s 남았음)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "파일 받아오는 중: %2$li 중 %1$li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "'%s' 패키지 시스템을 지원하지 않습니다"
 
-#: apt-pkg/init.cc:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "올바른 패키지 시스템 타입을 알아낼 수 없습니다"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "%s의 정보를 읽을 수 없습니다."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "sources.list에 '소스' URI를 써 넣어야 합니다"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "패키지 목록이나 상태 파일을 파싱할 수 없거나 열 수 없습니다."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습니다."
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "소스 목록을 읽을 수 없습니다."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "기본 설정 파일 %s에 잘못된 데이터가 있습니다. Package 헤더가 없습니다"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "핀 타입 %s이(가) 무엇인지 이해할 수 없습니다"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "캐시의 버전 시스템이 호환되지 않습니다"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion%d)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileDesc1)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "우와, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니다."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다."
 
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "%s 처리 중에 오류가 발생했습니다 (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "파일 의존성을 처리하는 데, %s %s 패키지가 없습니다"
 
-#: apt-pkg/pkgcachegen.cc:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "파일에서 제공하는 것을 모으는 중입니다"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum이 맞지 않습니다"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "해시 합이 맞지 않습니다"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, 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:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3056,12 +3044,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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG 오류: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3070,7 +3058,7 @@ msgstr ""
 "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습"
 "니다. (아키텍쳐가 빠졌기 때문입니다)"
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3079,48 +3067,48 @@ msgstr ""
 "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습"
 "니다."
 
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다."
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "크기가 맞지 않습니다"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Release 파일 %s에 섹션이 없습니다"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Release 파일 %s에 Hash 항목이 없습니다"
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Release 파일 %s에 'Valid-Until' 항목이 잘못되었습니다"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Release 파일 %s에 'Date' 항목이 잘못되었습니다"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "벤더 블럭 %s의 핑거프린트가 없습니다"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3129,48 +3117,48 @@ msgstr ""
 "CD-ROM 마운트 위치로 %s 사용\n"
 "CD-ROM을 마운트하는 중입니다\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "알아보는 중입니다.. "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "저장된 레이블: %s\n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "CD-ROM을 마운트 해제하는 중입니다...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "CD-ROM 마운트 위치 %s 사용\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "CD-ROM 마운트 해제하는 중입니다\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "디스크를 기다리는 중입니다...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "CD-ROM 마운트하는 중입니다...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "디스크에서 색인 파일을 찾는 중입니다...\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr "패키지 색인 %zu개, 소스 색인 %zu개, 번역 색인 %zu개, 서명 %zu개 발견\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3178,16 +3166,16 @@ msgstr ""
 "패키지 파일이 하나도 없습니다. 아마도 데비안 디스크가 아니거나 아키텍처가 잘"
 "못된 것 같습니다?"
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "레이블 발견: %s \n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "올바른 이름이 아닙니다. 다시 시도하십시오.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3196,90 +3184,90 @@ msgstr ""
 "이 디스크는 다음과 같습니다: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "패키지 목록을 복사하는 중입니다..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "새 소스 리스트를 쓰는 중입니다\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "레코드 %i개를 썼습니다.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "레코드 %i개를 파일 %i개가 빠진 상태로 썼습니다.\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\n"
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "%s 파일은 없으므로 무시합니다"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "다음의 인증 기록을 찾을 수 없습니다: %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "다음의 해시가 다릅니다: %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "%s에 키 모음을 설치하지 않았습니다."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "%2$s 패키지의 '%1$s' 릴리즈를 찾을 수 없습니다"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "'%s' 작업을 찾을 수 없습니다"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "'%s' 패키지는 가상 패키지이므로 버전을 선택할 수 없습니다"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3288,121 +3276,145 @@ msgstr ""
 "'%s' 패키지에서 설치한 버전이나 후보 버전을 선택할 수 없습니다. 둘 다 아닙니"
 "다."
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr "'%s' 패키지에서 최신 버전을 선택할 수 없습니다. 가상 패키지입니다."
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr "'%s' 패키지에서 후보 버전을 선택할 수 없습니다. 후보가 없습니다."
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr "'%s' 패키지에서 설치한 버전을 선택할 수 없습니다. 설치하지 않았습니다."
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "%s 설치하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "%s 설정 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "%s 패키지를 지우는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s 패키지를 완전히 지우는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "%s 사라짐 발견했습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "설치 후 트리거 %s 실행하는 중입니다"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "디렉터리 '%s' 없습니다."
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "'%s' 파일을 열 수 없습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "%s 준비 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s 푸는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s 패키지를 설정할 준비하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "%s 설치"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s 패키지를 지울 준비하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "%s 지움"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s 패키지를 완전히 지웠습니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "로그에 쓰는데 실패. openpty() 실패(/dev/pts가 마운트되어있지 않습니까?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "dpkg 실행하는 중입니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "의존성 문제 - 설정하지 않은 상태로 남겨둡니다"
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3410,26 +3422,26 @@ msgstr ""
 "보고서를 작성하지 않습니다. 오류 메시지에 따르면 예전의 실패 때문에 생긴 부수"
 "적인 오류입니다."
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 "보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다."
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr "보고서를 작성하지 않습니다. 오류 메시지에 따르면 메모리가 부족합니다."
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "보고서를 작성하지 않습니다. 오류 메시지에 따르면 dpkg 입출력 오류입니다."
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3438,44 +3450,44 @@ msgstr ""
 "관리 디렉터리를 (%s) 잠글 수 없습니다. 다른 프로세스가 사용하고 있지 않습니"
 "까?"
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "관리 디렉터리를 (%s) 잠글 수 없습니다. 루트 사용자가 맞습니까?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "dpkg가 중단되었습니다. 수동으로 '%s' 명령을 실행해 문제점을 바로잡으십시오."
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "잠기지 않음"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "'%s' 미러 파일이 없습니다 "
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "'%s' 미러 파일이 없습니다 "
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[미러 사이트: %s]"
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3484,7 +3496,7 @@ msgstr ""
 "%s 패치를 mmap과 파일 동작을 이용해 적용할 수 없습니다. 패치 파일이 손상된 것"
 "처럼 보입니다."
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3493,10 +3505,68 @@ msgstr ""
 "%s 패치를 mmap을 이용해 (mmap 관련 실패는 없음) 적용할 수 없습니다. 패치 파일"
 "이 손상된 것처럼 보입니다."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "연결이 너무 빨리 끊어졌습니다"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "주의: dpkg에서 자동으로 의도적으로 수행했습니다."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "override %s의 %lu번 줄 #2가 잘못되었습니다"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "override %s의 %lu번 줄 #3이 잘못되었습니다"
+
+#~ msgid "decompressor"
+#~ msgstr "압축 해제 프로그램"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "이미 압축이 풀린 '%s' 패키지에 대해 즉시 설정을 할 수 없습니다. 자세한 설"
+#~ "명은 man 5 apt.conf 페이지에서 APT::Immediate-Configure 항목을 보십시오."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "%s 처리 중에 오류가 발생했습니다 (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "내부 오류, 멤버를 찾을 수 없습니다"
 
diff --git a/po/ku.po b/po/ku.po
index 7e9e2a020..94e205729 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt-ku\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -19,153 +19,154 @@ msgstr ""
 "X-Generator: KAider 0.1\n"
 "Plural-Forms: nplurals=2; plural= n != 1;\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Navên paketan bi giştî :"
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Navên paketan bi giştî :"
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Pakêtên normal:"
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Pakêtên farazî yên safî:"
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Pakêta tenê ya farazî:"
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Pakêtên hevbeş yên farazî:"
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Winda: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Guhertoyên vekirî yên giştî:"
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Guhertoyên vekirî yên giştî:"
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Bindestên giştî:"
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Guhertoyên vekirî yên giştî:"
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Cihê giştî yê sist:"
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Cihê giştî yê veqetandî: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakêta dosya %s li derveyî demê ye."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Pakêt nayên dîtin"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Pêwist e tu mînakekê bidî"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Pakêt nehate dîtin %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Pelgehên Pakêt:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(nehate dîtin)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Sazkirî: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Berendam: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(ne tiştek)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Destika pakêtê:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Tabloya guhertoyan:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -202,29 +203,29 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 #, 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:92
+#: cmdline/apt-cdrom.cc:94
 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:127
+#: cmdline/apt-cdrom.cc:129
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Anîna %s %s biserneket\n"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr ""
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -252,12 +253,12 @@ msgstr ""
 "  -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar bike. "
 "mînak -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s ne paketeke DEB ya derbasdar e."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -271,40 +272,40 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nivîsandin ji bo %s ne pêkane"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Guhertoya debconf nehate stendin. debconf sazkirî ye?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Lîsteya dirêjahiya pakêtê zêde dirêj e"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Di şixulandina pêrista %s de çewtî"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Dema şixulandina naveroka %s çewtî"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -346,136 +347,136 @@ msgid ""
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Di koma pelgehên pakêta '%s' de hin pelgeh kêm in"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "DB xerabe ye, navê dosyeyê weke %s.old hate guherandin"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "Danegir kevn e, ji bo bilindkirina %s hewl dide"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Danegira %s nehate vekirin: %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr ""
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Tomara kontrola arşîvê tuneye"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr ""
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: pelrêça %s nayê xwendin\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr ""
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "%s ji hev nehate veçirandin"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr ""
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "%s venebû"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr ""
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Di arşîvê de qada pakêtê tuneye"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr ""
 
@@ -486,17 +487,17 @@ msgstr "%s venebû"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
 #, c-format
-msgid "Malformed override %s line %lu #1"
+msgid "Malformed override %s line %llu #1"
 msgstr ""
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
 #, c-format
-msgid "Malformed override %s line %lu #2"
+msgid "Malformed override %s line %llu #2"
 msgstr ""
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
 #, c-format
-msgid "Malformed override %s line %lu #3"
+msgid "Malformed override %s line %llu #3"
 msgstr ""
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -504,63 +505,51 @@ msgstr ""
 msgid "Failed to read the override file %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr ""
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr ""
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr ""
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr ""
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr ""
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr ""
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr ""
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr ""
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr ""
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr ""
@@ -569,134 +558,138 @@ msgstr ""
 msgid "Y"
 msgstr "E"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr ""
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "lê %s sazkirî ye"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "lê %s dê were sazkirin"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "lê sazkirina wê ne gengaz e"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "lê paketeke farazî ye"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "lê ne sazkirî ye"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "lê dê neyê sazkirin"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " û"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Ev pakêtên NÛ dê werine sazkirin:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Ev pakêt dê werine RAKIRIN:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr ""
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Ev paket dê werine bilindkirin:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (ji ber %s)"
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin."
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu ji nû ve sazkirî,"
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu hatine nizmkirin."
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Sazkirî]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 #, fuzzy
 msgid " [Not candidate version]"
 msgstr "Guhartoyên berendam"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr ""
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -704,177 +697,177 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr ""
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr ""
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s jixwe guhertoya nûtirîn e.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "lê %s dê were sazkirin"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Bindestî tên serrastkirin..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " neserketî."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Nikare bindestiyan rast kirin"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr ""
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Temam"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr ""
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr ""
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Anîna %sB/%sB ji arşîvan pêwist e.\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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Anîna %sB ji arşîvan pêwist e.\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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nikarî cihê vala li %s tesbît bike"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Cihê vala li %s têre nake."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Erê, wusa bike!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -882,46 +875,46 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Betal."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Dixwazî bidomînî [E/n]?"
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Anîna %s %s biserneket\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Daxistina çend pelan biserneket"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Sazkirin tê betalkirin."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -931,35 +924,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -975,15 +968,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -993,7 +986,7 @@ msgid_plural ""
 msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:"
 msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1001,25 +994,25 @@ msgid_plural ""
 msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:"
 msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1027,80 +1020,80 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Paketên şikestî"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Paketên tên pêşniyaz kirin:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Paketên tên tawsiyê kirin:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nikarî pakêta %s bibîne"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "lê %s dê were sazkirin"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Bilindkirin tê hesibandin..."
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Serneket"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Temam"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Pelrêça daxistinê nayê quflekirin"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1108,141 +1101,141 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Çavkanîna %s bîne\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Anîna çend arşîvan biserneket."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2951
+#: cmdline/apt-get.cc:2986
 #, 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:2957
+#: cmdline/apt-get.cc:2992
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Girêdan bi %s (%s) re pêk tê"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1288,7 +1281,7 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1296,33 +1289,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr ""
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Anîn:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr ""
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Çewt"
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, fuzzy, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%s hatine anîn..."
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Dixebite]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1330,46 +1323,62 @@ msgid ""
 "in the drive '%s' and press enter\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "lê ne sazkirî ye"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "lê %s dê were sazkirin"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "lê %s dê were sazkirin"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s jixwe guhertoya nûtirîn e.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s jixwe guhertoya nûtirîn e.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "lê %s dê were sazkirin"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "%s venebû"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1391,11 +1400,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1443,199 +1452,201 @@ msgstr ""
 msgid "Merging available information"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 #, fuzzy
 msgid "Failed to create pipes"
 msgstr "%s ji hev nehate veçirandin"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Xebitandina gzip biserneket"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Arşîv zêde kin e"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr ""
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr ""
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr ""
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 #, fuzzy
 msgid "Failed to allocate diversion"
 msgstr "%s venebû"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr ""
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr ""
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr ""
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Nivîsîna pelê %s biserneket"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Girtina pelê %s biserneket"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Rêça %s zêde dirêj e"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr ""
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr ""
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 #, fuzzy
 msgid "The diversion path is too long"
 msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Rêç zêde dirêj e"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, 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:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nikare %s bixwîne"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, fuzzy, c-format
 msgid "Unable to stat %s"
 msgstr "Nivîsandin ji bo %s ne pêkane"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Rakirina %s biserneket"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Nikare %s biafirîne"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, fuzzy, c-format
 msgid "Failed to stat %sinfo"
 msgstr "%s venebû"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Lîsteya pakêtan tê xwendin"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, 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
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1643,489 +1654,495 @@ msgid ""
 "package!"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 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
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 ""
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Nikarî li %s biguherîne"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr ""
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, fuzzy, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Nikarî pelê %s veke"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr ""
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 #, fuzzy
 msgid "Failed to stat"
 msgstr "%s venebû"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr ""
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, fuzzy, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Pakêt nehate dîtin %s"
 
-#: methods/cdrom.cc:208
+#: 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 ""
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "CD-ROM a şaş"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Dîsk nehate dîtin."
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Pel nehate dîtin"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Têketin"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr ""
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Nikare navê herêmî tesbît bike"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr ""
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr ""
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Çewiya xwendinê"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr ""
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Çewtiya nivîsînê"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr ""
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, fuzzy, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Danegira %s nehate vekirin: %s"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Lêpirsîn"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 #, fuzzy
 msgid "Unable to invoke "
 msgstr "%s venebû"
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Girêdan bi %s (%s) re pêk tê"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
-#: methods/connect.cc:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 
-#: methods/connect.cc:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Bi %s re tê girêdan"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nikarî '%s' çareser bike"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr ""
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, 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:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Di xebitandina gpgv de çewtiya nenas"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Ev pakêtên NÛ dê werine sazkirin:"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr ""
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr ""
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Hilbijartin neserketî"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 #, fuzzy
 msgid "Error writing to output file"
 msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Dema li pelî dihate nivîsîn çewtî"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Dema li pelî dihate nivîsîn çewtî"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "Nivîsîna pelê %s biserneket"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Girêdan pêk nehatiye"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Çewtiya hundirîn"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr ""
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Nikarî li %s biguherîne"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "%s venebû"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "%s venebû"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:311
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Nivîsîna pelê %s biserneket"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2154,93 +2171,93 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Hilbijartina %s nehatiye dîtin"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Çewtî!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Çêbû"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr ""
@@ -2250,343 +2267,360 @@ msgstr ""
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Opsiyona '%s' zêde dirêj e"
 
-#: 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 ""
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, fuzzy, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Nivîsandin ji bo %s ne pêkane"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nikarî derbasa %s bike"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nikarî qufila pelê %s veke"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nikarî pelê %s veke"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nikarî pelê %s veke"
 
-#: apt-pkg/contrib/fileutl.cc:841
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1087
 #, c-format
-msgid "read, still have %lu to read but none left"
+msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:874
+#: apt-pkg/contrib/fileutl.cc:1152
 #, c-format
-msgid "write, still have %lu to write but couldn't"
+msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Di girtina pelî de pirsgirêkek derket"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Di girtina pelî de pirsgirêkek derket"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Di girtina pelî de pirsgirêkek derket"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Di girtina pelî de pirsgirêkek derket"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+msgid "The package cache file is corrupted, it is too small"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Bindest"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "PêşBindest"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Pêşniyaz dike"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Tawsiye dike"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Nakokî"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Dikeve şunve"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Kevin dike"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Dişkîne"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "girîng"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "pêwist"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "opsiyonel"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "ekstra"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Guhartoyên berendam"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr ""
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Vekirina StateFile %s biserneket"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "%s ji hev nehate veçirandin"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, fuzzy, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Pakêt nehate dîtin %s"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, fuzzy, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Pakêt nehate dîtin %s"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "%s tê vekirin"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, 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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Nikarî pelê %s veke"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2594,265 +2628,220 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:501
-#, 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
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Peldanka '%s' kêm e"
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Peldanka '%s' kêm e"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "W: pelrêça %s nayê xwendin\n"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Pel tê anîn %li ji %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, fuzzy, c-format
 msgid "Unable to stat %s."
 msgstr "Nivîsandin ji bo %s ne pêkane"
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-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:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Dema şixulandina naveroka %s çewtî"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "nav guherandin biserneket, %s (%s -> %s)"
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum li hev nayên"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Hash Sum li hev nayên"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -2860,129 +2849,129 @@ msgid ""
 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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, 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:1698
+#: apt-pkg/acquire-item.cc:1709
 #, 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:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Mezinahî li hev nayên"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Pakêt nehate dîtin %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Pakêt nehate dîtin %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr ""
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Etîketa '%s' hatiye dîtin\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -2991,290 +2980,314 @@ msgstr ""
 "Navê dîskê: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Lîsteyên pakêtan tên jibergirtin..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i tomar hatin nivîsîn.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum li hev nayên"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Sazkirin tê betalkirin."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Peywira %s nehate dîtin"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Nikarî pakêta %s bibîne"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "%s hatine sazkirin"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "%s tê mîhengkirin"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "%s tê rakirin"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s bi tevahî hatine rakirin"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Peldanka '%s' kêm e"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Nikarî pelê %s veke"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "%s tê amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s tê derxistin"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Mîhengkirina %s tê amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "%s hatine sazkirin"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Rakirina %s tê amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "%s hatine rakirin"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Bi tevahî rakirina %s tê amadekirin"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s bi tevahî hatine rakirin"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Pelrêça daxistinê nayê quflekirin"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Nikarî pelê %s veke"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Girêdan zû hatiye girtin"
 
diff --git a/po/lt.po b/po/lt.po
index bd71f728b..8a1b20e8c 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -18,152 +18,153 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2008-08-02 05:04+0000\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paketas %s versijos numeriu %s turi netenkinamą priklausomybę:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 #, fuzzy
 msgid "Total package names: "
 msgstr "Visi paketų pavadinimai: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Visi paketų pavadinimai: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Normalūs paketai: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Virtualūs paketai: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Pavieniai virtualūs paketai: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Mišrūs virtualūs paketai: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Trūksta: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Viso skirtingų versijų: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Viso skirtingų aprašymų: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Viso priklausomybių: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Viso versijų/failų santykių yra: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Viso aprašymų/failų santykių yra: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Paketų nerasta"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nepavyko rasti paketo %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Paketų failai:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Surišti paketai:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(nerasta)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Įdiegta: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Kandidatas: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(nėra)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Paketo susiejimai: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Versijų lentelė:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1682
+#: cmdline/apt-cache.cc:1686
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -200,28 +201,28 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:92
+#: cmdline/apt-cdrom.cc:94
 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:127
+#: cmdline/apt-cdrom.cc:129
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Nepavyko pervadinti %s į %s"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Pakartokite šitą procesą su kitais CD savo rinkinyje."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Parametrai nurodyti ne poromis"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -249,12 +250,12 @@ msgstr ""
 "  -c=? Nuskaityti pateiktą konfigūracijos failą\n"
 "  -o=? Nurodyti tam tikrą konfigūracijos parametrą, pvz -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s nėra tikras DEB paketas."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -279,40 +280,40 @@ msgstr ""
 "  -c=? Nuskaityti šį konfigūracijų failą\n"
 "  -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nepavyko įrašyti į %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Nepavyko sužinoti debconf versijos. Ar įdiegtas debconf?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Paketo plėtinių sąrašas yra per ilgas"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Klaida apdorojant aplanką %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Šaltinio plėtinys yra per ilgas"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Klaida įrašant antraštę į turinio failą"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Klaida apdorojant turinį %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -398,26 +399,26 @@ msgstr ""
 "  -c=? Perskaityti šį nuostatų failą\n"
 "  -o=? Nustatyti savarankišką konfigūracijos nuostatą"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Nėra atitikmenų"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Kai kurių failų nėra paketų grupėje „%s“"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "Duomenų bazė pažeista, failas pervardintas į %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "Duomenų bazė yra sena, bandoma atnaujinti %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 #, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
@@ -426,111 +427,111 @@ msgstr ""
 "Duomenų bazės formatas yra netinkamas. Jei jūs atsinaujinote iš senesnės "
 "versijos, prašome pašalinkite ir perkurkite duomenų bazę."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Nepavyko atverti DB failo %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Nepavyko patikrinti %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr ""
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr ""
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "Į: Nepavyko perskaityti aplanko %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "Į: Nepavyko patikrinti %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "K: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "Į: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "K: Klaidos failui "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Nepavyko išspręsti %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Judesys medyje nepavyko"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Nepavyko atverti %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Nepavyko nuskaityti nuorodos %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Nepavyko atsieti nuorodos %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Nepavyko susieti %s su %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Archyvas neturėjo paketo lauko"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s neturi perrašymo įrašo\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, 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:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Nepavyko išskirti atminties"
 
@@ -540,18 +541,18 @@ msgid "Unable to open %s"
 msgstr "Nepavyko atverti %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Nekorektiškas perrašymas %s eilutėje %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Nekorektiškas perrašymas %s eilutėje %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -559,63 +560,51 @@ msgstr "Nekorektiškas perrašymas %s eilutėje %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "Nepavyko nuskaityti perrašymo failo %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Nežinomas suspaudimo algoritmas „%s“"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Suspaustai išvesčiai %s reikia suspaudimo rinkinio"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Nepavyko subprocesui sukurti IPC gijos"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Nepavyko sukurti FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr ""
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr ""
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Vidinė klaida, nepavyko sukurti  %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Nepavyko sukurti subproceso IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Nepavyko paleisti suspaudėjo "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "išskleidiklis"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "Nepavyko Nusk/Įraš į subprocesą/failą"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Skaitymo klaida skaičiuojant MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Nepavyko pervadinti %s į %s"
@@ -624,75 +613,79 @@ msgstr "Nepavyko pervadinti %s į %s"
 msgid "Y"
 msgstr "T"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Šie paketai turi neįdiegtų priklausomybių:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "bet %s yra įdiegtas"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "bet %s bus įdiegtas"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "tačiau jis negali būti įdiegtas"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "bet tai yra virtualus paketas"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "bet jis nėra įdiegtas"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "bet jis nebus įdiegtas"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " arba"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Bus įdiegti šie NAUJI paketai:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Bus PAŠALINTI šie paketai:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Šių paketų atnaujinimas sulaikomas:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Bus atnaujinti šie paketai:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Bus PAKEISTI SENESNIAIS šie paketai:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Bus pakeisti šie sulaikyti paketai:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (dėl %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -700,60 +693,60 @@ msgstr ""
 "Įspėjimas: Šie būtini paketai bus pašalinti.\n"
 "Tai NETURĖTŲ būti daroma, kol tiksliai nežinote ką darote!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu atnaujinti, %lu naujai įdiegti, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu įdiegti iš naujo, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu pasendinti, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Pastaba, žymima %s regex atitikimų formoje '%s'\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Pastaba, žymima %s regex atitikimų formoje '%s'\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Paketas %s yra virtualus, pateiktas:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Įdiegtas]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 #, fuzzy
 msgid " [Not candidate version]"
 msgstr "Galimos versijos"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Reikia pažymėti įdiegimui bent vieną."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -764,180 +757,180 @@ msgstr ""
 "Tai gali reikšti, kad paketas dingęs, nebenaudojamas \n"
 "arba prieinamas tik iš kitų šaltinių.\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Tačiau šie paketai jį pakeičia:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Paketas %s neturi diegimo kandidatų"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Pastaba: pažymimas %s vietoje %s\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Pakartotinas %s įdiegimas neįmanomas, jo nepavyksta parsiųsti.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ir taip jau yra naujausias.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Pažymėta versija %s (%s) paketui %s\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Pažymėta versija %s (%s) paketui %s\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Taisomos priklausomybės..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " nepavyko."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Nepavyko patenkinti priklausomybių"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 #, fuzzy
 msgid "Unable to minimize the upgrade set"
 msgstr "Nepavyko minimizuoti atnaujinimo rinkinio"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Įvykdyta"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Įvykdykite „apt-get -f install“, jei norite ištaisyti šias klaidas."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nepatenkintos priklausomybės. Bandykit naudoti -f."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "DĖMESIO: Šie paketai negali būti autentifikuoti!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Įdiegti šiuos paketus be patvirtinimo [t/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Nepavyko autentikuoti kai kurių paketų"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Atsirado problemų ir -y buvo panaudotas be --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Reikia pašalinti paketus, tačiau šalinimas išjungtas."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "Keista.. Dydis neatitinka, Parašykite laišką apt@packages.debian.org"
 
 #. 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Reikia parsiųsti %sB/%sB 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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Reikia parsiųsti %sB 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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Po šios operacijos bus naudojama %sB papildomos disko vietos.\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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 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:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nepavyko nustatyti %s laisvos vietos"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s nėra pakankamai laisvos vietos."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Taip, daryk kaip liepiu!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -948,28 +941,28 @@ msgstr ""
 "Jei norite tęsti, įveskite frazę „%s“\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Nutraukti."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Ar norite tęsti [T/n]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Nepavyko parsiųsti %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Nepavyko parsiųsti kai kurių failų"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Pavyko parsiųsti tik parsiuntimo režime"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -977,19 +970,19 @@ msgstr ""
 "Nepavyko parsiųsti kai kurių archyvų, pabandykite paleisti „apt-get update“ "
 "arba pabandykite su parametru --fix-missing?"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing bei laikmenų apkeitimas nepalaikomas"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Nepavyko pataisyti dingusių paketų."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Diegimas nutraukiamas."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -999,35 +992,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Atnaujinimo komandai argumentų nereikia"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1043,15 +1036,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "Ši informacija gali padėti išspręsti šią situaciją:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1061,7 +1054,7 @@ msgid_plural ""
 msgstr[0] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
 msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1069,19 +1062,19 @@ msgid_plural ""
 msgstr[0] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
 msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Norėdami juos pašalinti, paleiskite „apt-get autoremove“"
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Jūs galite norėti paleisti 'apt-get -f install\" klaidų taisymui:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1089,7 +1082,7 @@ msgstr ""
 "Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt-get -f install' be "
 "nurodytų paketų (arba nurodykite išeitį)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1101,80 +1094,80 @@ msgstr ""
 "leidimą, kuomet kai kurie paketai dar nebuvo sukurti arba buvo\n"
 "pašalinti iš \"Incoming\" aplanko."
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Sugadinti paketai"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Bus įdiegti šie papildomi paketai:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Siūlomi paketai:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Rekomenduojami paketai:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nepavyko rasti paketo %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Skaičiuojami atnaujinimai... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Nepavyko"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Įvykdyta"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vidinė klaida, problemos sprendimas kažką sugadino"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Nepavyko užrakinti parsiuntimų aplanko"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 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:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nepavyko surasti išeities teksto paketo, skirto %s"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1182,85 +1175,85 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Praleidžiama jau parsiųsta byla „%s“\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Reikia parsiųsti %sB išeities archyvų.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Parsiunčiamas archyvas %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Nepavyko gauti kai kurių arhcyvų."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
 
-#: cmdline/apt-get.cc:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Klaida procese-palikuonyje"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 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:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s"
 
-#: cmdline/apt-get.cc:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1268,7 +1261,7 @@ msgid ""
 msgstr ""
 "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1276,14 +1269,14 @@ msgid ""
 msgstr ""
 "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1292,7 +1285,7 @@ msgstr ""
 "%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos "
 "versijos %s paketo"
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1300,30 +1293,30 @@ msgid ""
 msgstr ""
 "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Nepavyko patenkinti %s priklausomybės %s: %s"
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Jungiamasi prie %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Palaikomi moduliai:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1369,7 +1362,7 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1377,33 +1370,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Imamas "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Gauti:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ignoruotas "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Klaida "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Parsiųsta %sB iš %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Vykdoma]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1414,46 +1407,62 @@ msgstr ""
 " „%s“,\n"
 "į įrenginį „%s“ ir paspauskite enter\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "bet jis nėra įdiegtas"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s ir taip jau yra naujausias.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s ir taip jau yra naujausias.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Nepavyko atverti %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1475,11 +1484,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Nežinomas paketo įrašas!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1544,196 +1553,198 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Sujungiama turima informaija"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Sugadintas archyvas"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar kontrolinė suma klaidinga, archyvas sugadintas"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Nežinomas TAR antraštės tipas %u. narys %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Archyvas per trumpas"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Nepavyko perskaityti archyvo antraščių"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr ""
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr ""
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr ""
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr ""
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr ""
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr ""
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr ""
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr ""
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Kelias %s per ilgas"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr ""
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr ""
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr ""
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Kelias per ilgas"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, 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:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nepavyko perskaityti %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Nepavyko pašalinti %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Nepavyko sukurti %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Skaitomi paketų sąrašai"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, 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
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Skaitomas failų sąrašas"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1741,485 +1752,491 @@ msgid ""
 "package!"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 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
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 ""
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Vidinė klaida, nepavyko aptikti nario %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr ""
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, fuzzy, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Nepavyko atverti failo %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr ""
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr ""
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr ""
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Nepavyko perskaityti cdrom duomenų bazės %s"
 
-#: methods/cdrom.cc:208
+#: 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 ""
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "Klaidingas CD-ROM"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Nepavyko atjungti CD-ROM įrenginyje %s, galbūt jis vis dar naudojamas."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Diskas nerastas."
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Failas nerastas"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Jungiamasi"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr ""
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr ""
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Jungiamasi per ilgai"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr ""
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Skaitymo klaida"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr ""
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr ""
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Rašymo klaida"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr ""
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nepavyko atsiųsti failo, serveris atsakė „%s“"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Užklausti"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr ""
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Jungiamasi prie %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
-#: methods/connect.cc:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Jungiamasi prie %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nepavyko surasti vardo „%s“"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Laikinas sutrikimas ieškant vardo „%s“"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nepavyko prisijungti prie %s %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Nežinoma klaida kviečiant gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Šie parašai buvo nevalidūs:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "Šių parašų nebuvo galima patikrinti, nes nėra viešojo rakto:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Laukiama antraščių"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr ""
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Prisijungimo laiko limitas baigėsi"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Klaida bandant rašyti į failą"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "Nepavyko patikrinti %s"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Prisijungti nepavyko"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Vidinė klaida"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
+#: apt-pkg/contrib/mmap.cc:117
 #, c-format
-msgid "Couldn't make mmap of %lu bytes"
+msgid "Couldn't make mmap of %llu bytes"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "Nepavyko atverti %s"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "Nepavyko pakeisti į %s"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:311
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Nepavyko patikrinti %s"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2248,93 +2265,93 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Klaida!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Baigta"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Parametrui %s reikia argumento."
@@ -2344,343 +2361,360 @@ msgstr "Parametrui %s reikia argumento."
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "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 ""
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Klaidingas veiksmas %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nepavyko pakeisti į %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nepavyko atverti rakinimo failo %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nepavyko rezervuoti rakinimo failo %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Procesas %s gavo segmentavimo klaidą"
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Procesas %s gavo segmentavimo klaidą"
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Procesas %s grąžino klaidos kodą (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Procesas %s netikėtai išėjo"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nepavyko atverti failo %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nepavyko atverti failo %s"
 
-#: apt-pkg/contrib/fileutl.cc:841
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Nepavyko sukurti subproceso IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Nepavyko paleisti suspaudėjo "
+
+#: apt-pkg/contrib/fileutl.cc:1087
 #, c-format
-msgid "read, still have %lu to read but none left"
+msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:874
+#: apt-pkg/contrib/fileutl.cc:1152
 #, c-format
-msgid "write, still have %lu to write but couldn't"
+msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Klaida užveriant failą"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Klaida užveriant failą"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Klaida sinchronizuojant failą"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Klaida užveriant failą"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Klaida sinchronizuojant failą"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+msgid "The package cache file is corrupted, it is too small"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Priklauso"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Priešpriklauso"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Siūlo"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Rekomenduoja"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Konfliktuoja"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Pakeičia"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Pakeičia"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Sugadina"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "Svarbu"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "privaloma"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "standartinis"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "nebūtinas"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "papildomas"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Konstruojamas priklausomybių medis"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Galimos versijos"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Priklausomybių generavimas"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Skaitoma būsenos informacija"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr ""
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Atveriama %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, 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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Nepavyko atverti failo %s"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2688,35 +2722,28 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:501
-#, 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
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2725,233 +2752,195 @@ msgstr ""
 "Kai kurių indeksų failų nepavyko parsiųsti, jie buvo ignoruoti arba vietoje "
 "jų panaudoti seni."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Trūksta aplanko „%s“"
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Trūksta aplanko „%s“"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "Nepavyko užrakinti sąrašo aplanko"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Parsiunčiamas %li failas iš %li (liko %s)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Parsiunčiamas %li failas iš %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr ""
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Nepavyko perskaityti arba atverti paketų sąrašo arba būklės failo."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Greičiausiai norėsite paleisti „apt-get update“, kad šios problemos būtų "
 "ištaisytos"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Nepavyko perskaityti šaltinių sąrašo."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-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:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Klaida apdorojant turinį %s"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "MD5 sumos neatitikimas"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Maišos sumos nesutapimas"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -2959,129 +2948,129 @@ msgid ""
 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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG klaida: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, 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:1698
+#: apt-pkg/acquire-item.cc:1709
 #, 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:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Neatitinka dydžiai"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Nepavyko atverti DB failo %s: %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Pastaba: pažymimas %s vietoje %s\n"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Pastaba: pažymimas %s vietoje %s\n"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Nepavyko atverti DB failo %s: %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Identifikuojama.. "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "Atjungiamas CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Naudojama CD-ROM prijungimo vieta %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Atjungiamas CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Laukiama disko...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Prijungiamas CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Rasta žymė „%s“\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3090,293 +3079,329 @@ msgstr ""
 "Šio disko pavadinimas: \n"
 "„%s“\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Kopijuojami paketų sąrašai..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Rašomas naujas šaltinių sąrašas\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Praleidžiama jau parsiųsta byla „%s“\n"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Maišos sumos nesutapimas"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Diegimas nutraukiamas."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Nebuvo rasta „%s“ versija paketui „%s“"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Nepavyko rasti užduoties %s"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Nepavyko rasti paketo %s"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "Įdiegta %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Konfigūruojamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Šalinamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Visiškai pašalintas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Trūksta aplanko „%s“"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Nepavyko atverti failo %s"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Ruošiamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Išpakuojamas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Ruošiamasi konfigūruoti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "Įdiegta %s"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Ruošiamasi %s pašalinimui"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "Pašalintas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Ruošiamasi visiškai pašalinti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "Visiškai pašalintas %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Nepavyko užrakinti sąrašo aplanko"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Nepavyko atverti failo %s"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr ""
 
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Nekorektiškas perrašymas %s eilutėje %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Nekorektiškas perrašymas %s eilutėje %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "išskleidiklis"
+
 #, fuzzy
 #~| msgid "Could not open file %s"
 #~ msgid "Could not patch file"
diff --git a/po/makefile b/po/makefile
index 9f8b7b22e..46b75ff4f 100644
--- a/po/makefile
+++ b/po/makefile
@@ -29,7 +29,7 @@ GETDOMAIN = $(word 1,$(subst /, ,$(1)))
 # Generate the list of files from the bits the other make files dropped 
 # and produce the .pot file.
 $(POTFILES) : $(PO)/%.pot :
-	printf "%s " "Generating POT file $@"
+	echo "Generating POT file $@"
 	echo $@ : $(wildcard $(PO)/domains/$*/*.*list) $(addprefix $(BASE)/,$(shell cat $(wildcard $(PO)/domains/$*/*.srclist))) > $@.d
 # From sh source
 	cat $(PO)/domains/$*/*.shlist 2> /dev/null | (cd $(BASE) && xargs -n1 bash --dump-po-strings) > $(PO)/domains/$*/sh.pot
@@ -40,22 +40,19 @@ $(POTFILES) : $(PO)/%.pot :
 	  --keyword=P_:1,2 \
 	  --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot
 	rm -f $(PO)/POTFILES_$*.in
-	$(MSGCOMM) --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=$@
 	# copy into the domain dirs to make rosetta happy
 	rm -f $(PO)/domains/$*/*.pot
 	cp $@ $(PO)/domains/$*
 
-$(PACKAGE)-all.pot: $(POTFILES)
-	$(MSGCOMM) --more-than=0 $(POTFILES) --output=$@
-
 # Filter the complete translation with the domain specific file to produce
 # only the subtext needed for this domain
 # We cannot express the dependencies required for this directly with a pattern
 # rule, so we use the .d hack.
-$(LANG_POFILES) : $(PO_DOMAINS)/%.po : $(PACKAGE)-all.pot
+$(LANG_POFILES) : $(PO_DOMAINS)/%.po : $(POTFILES)
 	printf "%s " "Generating $@"
 	echo $@ : $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot > $(PO)/$(call GETDOMAIN,$*)_$(notdir $@).d
-	$(MSGMERGE) $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@
+	$(MSGMERGE) --no-location $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@
 
 $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po
 	printf "%s: " "Generating $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo"
@@ -66,7 +63,16 @@ $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po
 stats:
 	for i in *.pot *.po; do echo -n "$$i: "; msgfmt --statistics $$i; done
 
-binary: $(POTFILES) $(PACKAGE)-all.pot $(MOFILES)
+binary: $(POTFILES) $(MOFILES)
+
+$(PACKAGE)-all.pot: $(POTFILES)
+	# we create our partial pot files without a header to avoid changing dates in *.mo files,
+	# but we want a header for our master-pot file, so we use a dummy pot with nothing but the header
+	$(XGETTEXT) --default-domain=$(PO)/$(PACKAGE)-dummy.pot --foreign --language=c \
+		-o $(PO)/$(PACKAGE)-dummy.pot --force-po --package-name=$(PACKAGE) \
+		--package-version=$(PACKAGE_VERSION) --msgid-bugs-address=deity@lists.debian.org /dev/null
+	$(MSGCOMM) --more-than=0 $(PO)/$(PACKAGE)-dummy.pot $(POTFILES) --output=$(PACKAGE)-all.pot
+	rm -f $(PO)/$(PACKAGE)-dummy.pot
 
 .PHONY: update-po
 update-po: $(PACKAGE)-all.pot
@@ -78,7 +84,7 @@ update-po: $(PACKAGE)-all.pot
 	done
 
 clean: clean/local
-clean/local: update-po
+clean/local:
 	rm -f $(MOFILES) $(LANG_POFILES) $(PO)/*.d
 
 # Include the dependencies that are available
diff --git a/po/mr.po b/po/mr.po
index 682aed942..91e86782c 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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 "
@@ -16,151 +16,152 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "पॅकेज %s आवृती %s मध्ये एक अनोळखी डीईपी:आहे\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "पॅकेजची सर्व नांवे: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 #, fuzzy
 msgid "Total package structures: "
 msgstr "पॅकेजची सर्व नांवे: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr " सामान्य पॅकेजेस्: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr " शुध्द आभासी पॅकेजेस्:"
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr " एकमेव आभासी पॅकेजेस्:"
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "मिश्रित आभासी पॅकेजेस्:"
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr " हरवलेले/गहाळ: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "एकूण स्पष्ट आवृत्या: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "एकूण स्पष्ट विवरणे: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "एकूण निर्भरता:"
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "एकूण व्हीईआर/संचिका परस्पर संबंध:"
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "एकूण विव/संचिका परस्पर संबंध:"
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "एकूण मॅपींगस् तरतूद: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "एकूण एकत्रित अक्षरसंच:"
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "एकूण परावलंबित आवृत्ती अवकाश:"
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "एकूण दुर्लक्षित अवकाश:"
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "हिशेबात घेतलेली एकूण अवकाश(जागा):"
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "पॅकेज संचिका %s सिंक्रोनाइज नाहीत"
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "पॅकेजेस सापडले नाहीत"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "तुम्हाला फक्त एकच नमुना द्यावा लागेल"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "पॅकेज %s शोधण्यास असमर्थ आहे"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "पॅकेज संचिका:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "दृतिका सिंक नाही,पॅकेज संचिका क्ष-संदर्भ करता येत नाही"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "एकत्रित पॅकेजेस:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(मिळाले नाही)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "अधिष्ठापित केले:"
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "उमेदवार:"
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(कोणताच नाही)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "पॅकेज (पिन):"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "आवृत्ती कोष्टक:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -233,29 +234,29 @@ msgstr ""
 "-o=? एखादा अहेतूक संरचना पर्याय निर्धारित करा उदा --o dir::cache=/tmp\n"
 "अधिक माहितीसाठी apt-cache(8) and apt.conf(5) ची मॅन्युअल पृष्ठे पहा \n"
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "या तबकडीला कृपया नाव द्या जसे डेबियन २ एलआरएल तबकडी १"
 
-#: cmdline/apt-cdrom.cc:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "कृपया तबकडी ड्राईव्हमध्ये ठेवून एंटर दाबा"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ "
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "तुमच्या संचामधील सर्व सीडीजसाठी याच कृतीची पुनरावृत्ती करा(हीच कृती करा)"
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "चलितमूल्य जोडीने नाहीत"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -283,12 +284,12 @@ msgstr ""
 " -c= ?  ही संरचना संचिका वाचा \n"
 " -o=?  एखदा अहेतुक संरचना पर्याय निर्धारित करा, उदा।eg -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s हे वैध डीईबी पॅकेज नाही "
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -312,40 +313,40 @@ msgstr ""
 "  -c=?  ही संरचना संचिका वाचा \n"
 " -o=?  एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे-  -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "%s मध्ये लिहिण्यास असमर्थ "
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "debconf आवृत्ती मिळू शकत नाही,debconf अधिष्ठापित झाली काय?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "पॅकेजेसची विस्तारित यादी खूप मोठी आहे"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "उगमस्थानाची विस्तारित यादी खूप मोठी आहे"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "शीर्षक संचिकेमधून मजकूर संचिकेत लिहिण्यात त्रुटी"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "त्रुटी प्रक्रिया मजकूर %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -426,26 +427,26 @@ msgstr ""
 "  -c=?   ही संरचना संचिका वाचा \n"
 "  -o=?  एखादा अहेतुक संरचना पर्याय निर्धारित करा"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "निवडक भाग जुळत नाही"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "`%s' पॅकेज संचिका समुहातील काही संचिका गहाळ आहेत"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "DB खराब झाली होती, संचिका %s.old म्हणून पुनर्नामांकित केली"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB जुने आहे,%s पुढच्या आवृतीसाठी प्रयत्न करत आहे"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 #, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
@@ -454,111 +455,111 @@ msgstr ""
 "DB स्वरुप वैध नाही. जर तुम्ही apt च्या जुन्या आवृत्तीपासून पुढिल आवृत्तीकृत करत असाल तर, "
 "कृपया माहितीसंच काढून टाका आणि पुनर्निर्मित करा"
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "%s: %s DB संचिका उघडण्यास असमर्थ"
 
-#: 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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s स्टेट करण्यास असमर्थ"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "अर्काईव्ह मध्ये नियंत्रण माहिती संच नाही"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "संकेतक घेण्यास असमर्थ"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "धोक्याची सूचना:%s संचयिका वाचण्यास असमर्थ \n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "धो.सू.:%s स्टेट करण्यास असमर्थ\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E:"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "धो.सू.:"
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "ई: संचिकेला लागू होणाऱ्या चुका"
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "%s सोडवण्यास असमर्थ"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "ट्री चालणे असमर्थ"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "%s उघडण्यास असमर्थ"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr "%s [%s] डी दुवा\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "%s वाचणारा दुवा असमर्थ"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "%s दुवा काढण्यास असमर्थ"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "%s चा %s दुवा साधण्यास असमर्थ"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr "%sB हीट ची डिलींक मर्यादा\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "अर्काईव्ह ला पॅकेज जागा नाही"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: 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:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc-स्मरणस्थळ शोधण्यास असमर्थ"
 
@@ -568,18 +569,18 @@ msgid "Unable to open %s"
 msgstr "%s उघडण्यास असमर्थ"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -587,63 +588,51 @@ msgstr "व्यंगीत/हिडीस दुर्लक्षित क
 msgid "Failed to read the override file %s"
 msgstr "%s दुर्लक्षित संचिका वाचण्यास असमर्थ"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "माहित नसलेली/ले संक्षेप पद्धती/अलगोरिथम '%s'"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "%s संकलित आऊटपुट/निर्गत साठी संक्षेप संचाची गरज"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "उपक्रियेचा आयपीसी वाहिनी तयार करण्यास असमर्थ"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "संचिका * तयार करण्यास असमर्थ"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "नविन प्रक्रिया(प्रोसेस) निर्माण करण्यास असमर्थ"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "चॉईल्ड(प्रोसेस)ला संकलित करा"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "अंतर्गत त्रुटी, %s तयार करण्यास असमर्थ"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "आयपीसी उपक्रिया तयार करण्यास असमर्थ"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "दाबक(संकलितकर्ता) कर्यान्वित करण्यास असमर्थ"
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "असंकलितकर्ता "
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "IO ची उपक्रिया/संचिका असमर्थ "
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "MD5 कामप्युटींग करतांना वाचण्यासाठी असमर्थ"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "%s दुवा मोकळा/सुटा करण्यास अडचण"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ "
@@ -652,75 +641,79 @@ msgstr "%s ला पुनर्नामांकन %s करण्यास
 msgid "Y"
 msgstr "होय"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "पण %s संस्थापित झाले"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "पण %s संस्थापित करायचे आहे"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "पण ते संस्थापित करण्याजोगे नाही"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "पण ते आभासी पॅकेज आहे"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "पण ते संस्थापित केले नाही"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "पण ते संस्थापित होणार नाही"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr "किंवा"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "खालील नविन पॅकेजेस संस्थापित होतील:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "खालील पॅकेजेस परत ठेवली गेली:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (च्या मुळे %s)"
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -728,60 +721,60 @@ msgstr ""
 "धोक्याची सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n"
 "तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले,"
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu पुनर्संस्थापित केले,"
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu मागील आवृत्तीकृत केले,"
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "%s हे आभासी पॅकेज ह्यांच्याकडून तरतूद केले आहे,:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr "[संस्थापित केले]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 #, fuzzy
 msgid " [Not candidate version]"
 msgstr "कंॅडिडेट आवृत्त्या"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "तुम्ही संस्थापित करण्यासाठी एक निश्चित स्पष्टपणे निवडले पाहिजे."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -792,177 +785,177 @@ msgstr ""
 "याचा अर्थ असाही आहे की पॅकेज सापडत नाही,ते कालबाह्य किंवा \n"
 " म्हणजे ते दुसऱ्या उगमातून उपलब्ध\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "तथापि खालील पॅकेजेस मध्ये बदल झाला:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "%s पॅकेजला संस्थापित कॅन्डिडेट नाही"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "%s चे पुनर्संस्थापन शक्य नाही, हे डाऊनलोड करता येत नाही.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "डिपेन्डन्सीज बरोबर/दुरूस्त करत आहे..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr "अयशस्वी/चूकीचे झाले."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे "
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "आवृत्तीकृत संच कमीतकमी करण्यास असमर्थ"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr "झाले"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "अनमेट डिपेंडन्सीज.-f.वापरून प्रयत्न करा "
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "धोक्याची सूचना:खालील पॅकेजेस् प्रमाणित करु शकत नाही! "
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "प्रमाणीकरणाची धोक्याची सूचना दुर्लक्षित करा.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "पडताळून पाहिल्याशिवाय ही पॅकेजेस संस्थापित करायची का [हो/नाही]?"
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "काही पॅकेजेसचे प्रमाणिकरण होऊ शकत नाही"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "अंतर्गत त्रुटी, तुटलेल्या पॅकेजेस बरोबर  संस्थापित पॅकेजला आवाहन केले गेले/बोलावले गेले!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "पॅकेजेस कायमची काढायची आहेत पण रिमूव्ह अकार्यक्षम केले आहे"
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "अंतर्गत त्रुटी,क्रम अजून संपला नाही"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "किती विचित्र...आकार जुळत नाहीत, ईमेल apt@packages.debian.org"
 
 #. 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:1142
+#: cmdline/apt-get.cc:1156
 #, 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:1147
+#: cmdline/apt-get.cc:1161
 #, 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:1154
+#: cmdline/apt-get.cc:1168
 #, 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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "या क्रियेनंतर, %sB डिस्क जागा मोकळी होईल.\n"
 
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s मध्ये तुमच्याकडे पुरेशी जागा नाही."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "क्षुल्लक फक्त निर्देशित केले आहे पण हे क्षुल्लक कृति/ऑपरेशन नाही."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "हो, मी म्ह्टल्याप्रमाणे करा!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -973,28 +966,28 @@ msgstr ""
 "पुढे '%s' उक्ती मध्ये लिहिणार \n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "व्यत्यय/बंद करा."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s आणणे असफल\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1002,20 +995,20 @@ msgstr ""
 "काही आर्काइव्हज आणण्यास असमर्थ, कदाचित apt-get रन करुन अद्ययावत करा किंवा --fix- "
 "बरोबर प्रयत्न कराहरवलेले/गहाळ?"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "--fix- सापडत नाही आणि माध्यम/मिडिया अदलाबदल हे सध्या तांत्रिक मदत देऊ शकत नाही"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "न सापडणारी पॅकेजेस नीट करण्यास असमर्थ."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "संस्थापन खंडित करत आहे."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1025,35 +1018,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ    शकत नाही."
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "आपण या गोष्टी काढून टाकता नये, ऑटोरिमूव्हर सुरू करता येत नाही"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1071,15 +1064,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "अंतर्गत त्रुटी, AutoRemoverने स्टफला तोडले"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1089,7 +1082,7 @@ msgid_plural ""
 msgstr[0] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
 msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1097,21 +1090,21 @@ msgid_plural ""
 msgstr[0] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
 msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "तुम्हाला कदाचित 'apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा "
 "लागेल'यात बदल करण्यासाठी:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1119,7 +1112,7 @@ msgstr ""
 "अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन ('apt-get -f install') पॅकेजशिवाय प्रयत्न करा "
 "(किंवा पर्याय सांगा)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1131,80 +1124,80 @@ msgstr ""
 "विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n"
 "किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील."
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "तुटलेली पॅकेजेस"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "सुचवलेली पॅकेजेस:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "शिफारस केलेली पॅकेजेस:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s पॅकेज सापडू शकले नाही"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "पुढिल आवृत्तीची गणती करीत आहे..."
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "असमर्थ"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "झाले"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे"
 
-#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1212,104 +1205,104 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s उगम घ्या\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "काही अर्काईव्हज आणण्यास असमर्थ."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n"
 
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
 
-#: cmdline/apt-get.cc:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "चाईल्ड प्रक्रिया अयशस्वी"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे"
 
-#: cmdline/apt-get.cc:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ"
 
-#: cmdline/apt-get.cc:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, 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:2889
+#: cmdline/apt-get.cc:2924
 #, 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:2912
+#: cmdline/apt-get.cc:2947
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे"
 
-#: cmdline/apt-get.cc:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1318,37 +1311,37 @@ msgstr ""
 "आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s "
 "डिपेंडन्सी पूर्ण होऊ शकत नाही"
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, 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:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s"
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही."
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ "
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) ला जोडत आहे"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1435,7 +1428,7 @@ msgstr ""
 " apt.conf(5)  पुस्तिका पाने पहा.\n"
 "         ह्या APT ला सुपर काऊ पॉवर्स आहेत\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1443,33 +1436,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "दाबा"
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "मिळवा:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "आय.जी.एन."
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "दोष इ.आर.आर."
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%s (%sB/s) मध्ये %sB मिळविला\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr "[काम करत आहे]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1480,46 +1473,62 @@ msgstr ""
 "%s'\n"
 "'%s' ड्राईव्ह मध्ये व एंटर कळ दाबा\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "पण ते संस्थापित केले नाही"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "%s उघडण्यास असमर्थ"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1541,11 +1550,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "अनोळखी पॅकेज माहिती संच!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1607,196 +1616,198 @@ msgstr ""
 msgid "Merging available information"
 msgstr "उपलब्ध माहितीचे एकत्रीकरण करत आहे"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "पाईप तयार करण्यास असमर्थ"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "exec gzip करण्यास असमर्थ"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "बिघडलेली अर्काईव्हज"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "टार(टेपअर्काईव्ह) चेकसम चुकला, बिघडलेली अर्काईव्ह"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "अपरिचित TAR शीर्षक प्रकार %u, मेंबर %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "अयोग्य अर्काईव्ह ओळख सही"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "अर्काईव्ह मेंबर शीर्षक वाचण्यास त्रुटी"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, fuzzy, c-format
 msgid "Invalid archive member header %s"
 msgstr "अयोग्य अर्काईव्ह मेंबर शीर्षक"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "अयोग्य अर्काईव्ह मेंबर शीर्षक"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "अर्काईव्ह खूप छोटे आहे"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "अर्काईव्ह शीर्षके वाचणे असफल"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "सुटा करण्यासाठी बोलावलेला/आणलेला सांधा(ड्रापनोड)अजुनही जुळलेलाच सांधा(लिंकनोड) आहे"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "हॅश एलिमेंट शोधूने काढण्यास असमर्थ!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "नेमून दिलेल्यात फेरबदल करण्यास अयशस्वी"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "AddDiversion/ऍड डायव्हर्जन मध्ये आंतरिक दोष"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "डायव्हर्जन पुनः लिहिण्यास प्रयत्न करत आहे,%s -> %s and %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "%s -> %s डायव्हर्जन दुप्पट मिळवा"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "%s/%s संचिरित संचिकाची दुसरी प्रत/नक्कल"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "%s फाईल मध्ये लिहिण्यास असमर्थ"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "%s फाईल बंद करण्यास असमर्थ"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "मार्ग %s हा खूप लांब आहे"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s एकापेक्षा जास्त वेळा उघडत आहे"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "%s संचिका डायव्हर्ट केली आहे/वळवली आहे"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "डायव्हर्जन इच्छित %s/%s मध्ये लिहिण्याचा पॅकेज प्रयत्न करत आहे"
 
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "डायव्हर्जन मार्ग हा खूप लांब आहे"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "%s संचिका ही संचिका नसलेल्या संचिकेबरोबर बदललेली आहे"
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "नोडचे त्याच्या हॅश बकेटमध्ये/बादलीत स्थान निश्चित करण्यास असमर्थ"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "मार्ग खूप लांब आहे"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "%s च्या आवृत्तीशी पुनः लिहिलेल्या पॅकेज जुळत नाही"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "File %s/%s, %s पॅकेज मधल्या एका वर पुनर्लिखित होते"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s वाचण्यास असमर्थ"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s स्टॅट करण्यास असमर्थ"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "%s कायमचे काढून टाकण्यास असमर्थ"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "%s तयार करण्यास असमर्थ"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "% sinfo स्टॅट करण्यास असमर्थ"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "info आणि temp संचिका सारख्याच फाईलप्रणालीत असणे आवश्यक आहे"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "पॅकेज याद्या वाचत आहोत"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "admin dir %sinfo असे बदलण्यास असमर्थ"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "पॅकेजचे नाव मिळवत असताना आंतरिक दोष/त्रुटी मिळाली"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "फाईलचे लिस्टिंग वाचत आहे"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1806,113 +1817,114 @@ msgstr ""
 "'%sinfo/%s'. जर तुम्ही ही फाईल रिस्टोअर करू शकला नाहीत.तर ती रिकामी करा आणि लगेच "
 "ह्या सारखी आवृत्ती असणारे पॅकेज पुनर्संस्थापितकरा!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "%sinfo/%s फाईल यादी वाचण्यास असमर्थ"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "नोड मिळवताना आंतरिक त्रुटी मिळाली"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "%sdiversions ही डायव्हर्जन फाईल उघडण्यात असमर्थ"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 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
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "डायव्हर्जन मिळवताना आंतरिक त्रुटी मिळाली"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "pkg अस्थाई स्मृतीकोष प्रथम इनिशिअलाईज्ड केला पाहिजे"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "पॅकेज शोधण्यास असमर्थ: शिर्षक,आॅफसेट %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "आॅफसेट %lu, सद्यस्थिती फाईलमध्ये वाईट कॉन्फ फाईल भाग"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "ऑफसेट %lu, MD5. पार्सिंग मध्ये त्रुटी "
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "हा वैध DEB अर्काईव्ह नाही,'%s' मेंबर उपलब्ध नाही"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 "हा वैध DEB अर्काईव्ह नाही, ह्याला '%s', '%s' किंवा '%s' मेंबर नाही"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "%s मध्ये बदलता येत नाही"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "अंतर्गत त्रुटी,%s मेंबर शोधू शकत नाही"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "वैध नियंत्रण फाईल शोधण्यास असमर्थ"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "अनपार्सेबल नियंत्रण फाईल"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "%s साठी पाईप उघडता येत नाही"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "%s क्रियेपासून चूक वाचा"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "स्टॅट करण्यास असमर्थ"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "%s सीडी-रॉम माहिती संच वाचण्यास असमर्थ"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1920,56 +1932,56 @@ msgstr ""
 "कृपया सी-डी रॉम APT कडून ओळखण्यासाठी apt-cdrom चा वापर करा.apt-get update हे "
 "नवीन सीडी राॅम अधिक मिळवण्यासाठी वापरता येणार नाही"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "चूकीची सी-डी रॉम"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "%s मधील सीडी-रॉम अनमाऊंट करण्यास असमर्थ, अजूनही ते वापरता असेल."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "डिस्क सापडत नाही"
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "फाईल सापडली नाही"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "अवैध यू आर एल, स्थानिक यू आर आय एस सुरू होऊ नये यापासून //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "लॉग इन करत आहे"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "पिअर नाव सांगण्यास/सापडण्यास असमर्थ"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "स्थानिक नाव सांगण्यास असमर्थ"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "सर्व्हर ने संबंध जोडण्यास नकार दिला व सांगितले: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "सर्व्हरने %s सांगितले,यूजर असमर्थ:"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "सर्व्हरने %s सांगितले, पास असमर्थ:"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -1977,319 +1989,324 @@ msgstr ""
 "प्रॉक्सी सर्व्हर निर्देशित केला पण लॉगीन स्क्रिप्ट नाही, प्राप्त केलेले ::ftp:: प्रॉक्सीलॉगीन "
 "निरर्थक आहे."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "सर्व्हरने %s सांगितले, '%s' लॉग इन स्क्रिप्ट आज्ञावली असमर्थ:"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "सर्व्हरने %s सांगितले: टाईप असमर्थ:"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "वेळेअभावी संबंध जोडता येत नाही"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "सर्व्हरने संबंध जोडणी बंद केली"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "त्रुटी वाचा"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "प्रतिसाधाने बफर भरुन गेले."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "प्रोटोकॉल खराब झाले"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "लिहिण्यात त्रुटी"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "सॉकेट तयार करू शकत नाही"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "डेटा सॉकेट जोडू शकत नाही,जोडणी वेळेअभावी बंद केली"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "पॅसिव्ह सॉकेट जोडता येत नाही"
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "गेटऍड्रेसइनफो लिसनिंग सॉकेट घेण्यास असमर्थ होते"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "सॉकेट चिकटवता येत नाही"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "सॉकेट वर ऐकता येत नाही"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "सॉकेटचे नाव सांगता येत नाही"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "पोर्ट आज्ञा पाठवता येत नाही/पोर्ट आज्ञा  पाठविण्यास असमर्थ"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "माहित नसलेला पत्ता फॅमिली %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "ई.पी.आर.टी. चुकले,सर्व्हरने %s सांगितले"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "डेटा सॉकेट जोडणी वेळेअभावी तुटली"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "जोडणी स्विकारण्यास असमर्थ"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "फाईल हॅश करण्यात त्रुटी"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "सर्व्हरने %s सांगितले, फाईल मिळवण्यास असमर्थ"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "डेटा सॉकेट वेळेअभावी तुटले"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "सर्व्हरने %s सांगितले, डेटा स्थानांतरण चुकले"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "प्रश्न"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "जारी करण्यास करण्यास असमर्थ"
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "%s (%s) ला जोडत आहे"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[आयपी:%s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "%s:%s (%s). साठी जोडणी इनिशिएट/पुढाकारीत करू शकत नाही"
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "%s:%s (%s) ला जोडू शकत नाही,जोडणी वेळेअभावी तुटली"
 
-#: methods/connect.cc:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s ला जोडत आहे"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "%s रिझॉल्व्ह होऊ शकत नाही "
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "'%s' रिझॉल्व्ह करताना तात्पुरती त्रुटी"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना काहीतरी वाईट घडले"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "%s %s ला जोडण्यास असमर्थ:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!"
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "किमान एक अवैध सही सापडली."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "खालील सह्या अवैध आहेत:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "खालील सह्यांची खात्री करता येत नाही कारण सार्वजनिक कीउपलब्ध नाही:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "शीर्षकासाठी थांबले आहे...."
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "%u अक्षरांवर एक शीर्षक ओळ मिळाली"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "वाईट शीर्षक ओळ"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP सर्व्हरने अवैध प्रत्त्युत्तर शीर्षक पाठविले"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP सर्व्हरने अवैध मजकूर-लांबी शीर्षक पाठविले "
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP सर्व्हरने अवैध मजकूर-विस्तार शीर्षक पाठविले"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "HTTP सर्व्हरने विस्तार तांत्रिक मदत जोडली"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "अपरिचित दिनांक प्रकार/स्वरूप "
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "चुकले/असमर्थ निवड करा"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "जोडणी वेळेअभावी तुटली"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "सर्व्हर मधून वाचण्यात चूक"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "फाईल छोटी करणे असफल"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "चुकीचा शीर्षक डाटा"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "जोडणी अयशस्वी"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "अंतर्गत त्रुटी"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "रिकामी फाईल mmap करता येणार नाही"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "%s साठी पाईप उघडता येत नाही"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "mmap चे %lu बाईटस् करता येणार नाहीत"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "%s उघडण्यास असमर्थ"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "जारी करण्यास करण्यास असमर्थ"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "mmap चे %lu बाईटस् करता येणार नाहीत"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "फाईल छोटी करणे असफल"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2318,93 +2335,93 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "%s निवडक भाग सापडत नाही"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "संक्षिप्तरुपाचा माहित नसलेला प्रकार: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "%s संरचना फाईल उघडत आहे"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "रचनेच्या नियमांचा दोष %s:%u: ब्लॉक नावाशिवाय सुरू होतो."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "रचनेच्या नियमांचा दोष : %s:%u: मालफॉर्मड् टॅग"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "रचनेच्या नियमांचा दोष %s:%u: मुल्यांच्या नंतर अधिक जंक"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "रचनेच्या नियमांचा दोष %s:%u: दिशादर्शक फक्त उच्च पातळीवर केले जाऊ शकतात"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "रचनेच्या नियमांचा दोष %s:%u: खूपच एकात एक इनक्लूडस्"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "रचनेच्या नियमांचा दोष %s:%u: ह्या पासून  समाविष्ट "
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "नियम रचनेचा दोष %s:%u: '%s' दिशादर्शक असहाय्यकारी"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr "रचनेच्या नियमांचा दोष %s:%u: दिशादर्शक फक्त उच्च पातळीवर केले जाऊ शकतात"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "नियम रचनेचा दोष %s:%u: फाईलच्या अंती अधिक जंक"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... चूक/त्रुटी!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... झाले"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "आदेश रेखा पर्याय '%c' [पासून %s] हे माहित नाही."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "आदेश रेखा पर्याय %s नीट समजला नाही"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "आदेश रेखा पर्याय %s हे बूलियन नाही"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "पर्याय %s साठी ऑर्गुमेंट पाहिजे"
@@ -2414,343 +2431,361 @@ msgstr "पर्याय %s साठी ऑर्गुमेंट पाह
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "पर्याय %s: संरचितेच्या यादीतील कलमांचा तपशीलाला असलेच पाहिजे ते =<मूल्य>."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "%s पर्याय ला पूर्णांक ऑर्गुमेंट पाहिजे,'%s' नको"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "'%s' पर्याय खूप लांब आहे"
 
-#: 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 "%s संवेदना हे समजत नाही, चूक की बरोबर चा प्रयत्न करा."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "%s अवैध क्रिया"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "%s माऊंट पॉईंट स्टॅट करण्यास असमर्थ"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "%s मध्ये बदलण्यास असमर्थ"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "सीडी-रॉम स्टॅट करण्यास असमर्थ"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "फक्त वाचण्यासाठी कुलूप संचिका %s साठी कुलूपबंदचा वापर करीत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "%s कुलूप फाईल उघडता येत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "%s nfs(नेटवर्क फाईल सिस्टीम) माऊंटेड कुलुप फाईल ला कुलुप /बंद करता येत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "%s कुलुप मिळवता येत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "%s साठी थांबलो पण ते तेथे नव्हते"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला."
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला."
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे"
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "%s उपक्रिया अचानकपणे बाहेर पडली"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "%s फाईल उघडता येत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "%s साठी पाईप उघडता येत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "आयपीसी उपक्रिया तयार करण्यास असमर्थ"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "दाबक(संकलितकर्ता) कर्यान्वित करण्यास असमर्थ"
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही"
 
-#: apt-pkg/contrib/fileutl.cc:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही"
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "फाईल बंद करण्यात अडचण"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "फाईल बंद करण्यात अडचण"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "संचिकेची syncing समस्या"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "फाईल अनलिंकिंग करण्यात अडचण"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "संचिकेची syncing समस्या"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "पॅकेज अस्थाई स्मृतिकोष"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल खराब झाली आहे"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल ही विजोड आवृत्ती आहे"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल खराब झाली आहे"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "'%s' आवृत्तीकरण प्रणालीला हे APT तांत्रिक मदत देऊ शकत नाही"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "पॅकेज अस्थाई स्मृतीकोष वेगळ्या वास्तुविद्ये साठी बनवला गेला"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "अवलंबित"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "पूर्व अवलंबित"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "सुचवणे"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "शिफारस"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "परस्परविरोध"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "परत त्याठिकाणी आणा"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "अप्रचलित"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "तोडले"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "अत्यावश्यक"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "आवश्यक"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "मानक"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "एच्छिक"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "अधिक"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "अवलंबित रचना बांधणी करत आहे"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "कंॅडिडेट आवृत्त्या"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "अवलंबित/विसंबून असलेले उत्पादन "
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "स्थिती माहिती वाचत आहे"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "%s StateFile उघडणे असफल"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "%s तात्पुरत्या StateFile मध्ये लिहिणे असफल"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "स्त्रोत सुची %s (यूआरआय) मध्ये %lu वाईट/व्यंग रेषा"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "स्त्रोत सुची %s (absolute dist) मध्ये %lu वाईट/व्यंग रेषा"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "%s उघडत आहे"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "%s स्त्रोत सुचीमध्ये ओळ %u खूप लांब आहे."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "स्त्रोत सुची %s (प्रकार) मध्ये %u वाईट/व्यंग रेषा"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
 
-#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, 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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "%s फाईल उघडता येत नाही"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2761,26 +2796,19 @@ msgstr ""
 "गुंतागुंतीमुळे/Pre-Depends पूर्व अवलंबित आवर्तन.हे नेहमीच वाईट असते, पण जर तुम्हाला ते खरोखर "
 "करावयाचे असेल तर,APT::Force-LoopBreak पर्याय कार्यान्वित करा."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "'%s' प्रकारची निर्देशक संचिका सहाय्यकारी नाही"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 "%s पॅकेज पुनः:अधिष्ठापित करण्याची गरज आहे, परंतु मला त्यासाठी ऑर्काइव्ह सापडू शकले नाही."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2788,11 +2816,11 @@ msgstr ""
 "दोष,पॅकेज समस्या निवारक::निवारण  करतांना अडथळा निर्माण झाला, ह्याचे कारण स्थगित  "
 "पॅकेजेस असू शकते."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे."
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2801,236 +2829,198 @@ msgstr ""
 "काही अनुक्रमणिका संचयिका डाऊनलोड    करण्यास असमर्थ,त्या दुर्लक्षित झाल्या, किंवा "
 "त्याऐवजी जुन्या वापरल्या गेल्या."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "संचयिका यादीत %s पार्शल हरवले आहे."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "ऑर्काइव्ह संचयिका %spartial गायब आहे."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "%li ची %li(%s राहिलेले) संचिका पुन:प्राप्त करीत आहे"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "%li ची %li संचिका पुन:प्राप्त करीत आहे"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही. "
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा."
 
-#: apt-pkg/init.cc:147
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "'%s' पॅकेजींग प्रणाली सहाय्यकारी नाही"
 
-#: apt-pkg/init.cc:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "योग्य असा पॅकेजिंग प्रणाली प्रकार निश्चित करण्यास असमर्थ "
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "%s स्टॅट करण्यात असमर्थ. "
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "तुम्ही तुमच्या उगमस्थान यादीत URI घाला"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "पॅकेजच्या याद्या किंवा संचिकेची स्थिती स्पष्ट होऊ शकत नाही किंवा ती उघडू शकत नाही."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "तुम्ही ह्या समस्यांचे निवारण करण्यासाठी  apt-get update प्रोग्राम चालू करु शकता"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "उगमांच्या याद्या वाचता येणार नाहीत."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "पसंतीच्या संचिकेत अवैध माहितीसंच, पॅकेजला शीर्षक नाही "
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "%s पिनचा प्रकार समजलेला नाही"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "पिन करिता प्राधान्य/अग्रक्रम (किंवा शून्य)निर्देशीत केलेला नाही"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "अस्थायी स्मृतिकोष मध्ये विसंगत आवृतीकरण प्रणाली आहे"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "%s (नविन पॅकेज) प्रक्रिया करीत असतांना दोष आढळून आला"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "%s (वापरातील पॅकेज१) प्रक्रिया करीत असतांना दोष आढळून आला"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "%s (NewFileDesc1) वर प्रक्रिया सुरू असताना त्रुटी उद्भवली"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "%s प्रक्रिया करीत असतांना दोष आढळून आला(वापरातील पॅकेज२)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "%s(नविन संचिका आवृती१) प्रक्रिया करीत असतांना दोष आढळून आला"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "%s (नविन आवृत्ती १) प्रक्रिया करीत असतांना दोष आढळून आला"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "%s(वापरातील पॅकेज३) प्रक्रिया करीत असतांना दोष आढळून आला"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "%s (NewFileDesc2) वर प्रक्रिया सुरू असताना त्रुटी उद्भवली"
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही पॅकेज नांवांच्या संख्येची मर्यादा ओलांडली "
 "आहे."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही आवृत्त्या संख्येची मर्यादा ओलांडली आहे."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "अरेवा!, तुम्ही तर ह्या ऍप्टच्या कार्यक्षमतेपेक्षाही विवरण संख्येची मर्यादा ओलांडली आहे."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही अवलंबित/विसंबून असलेल्या संख्येची मर्यादा "
 "ओलांडली आहे."
 
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "%s (तरतूद/पुरवलेल्या संचिका जमा) प्रक्रिया करीत असतांना दोष आढळून आला"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही "
 
-#: apt-pkg/pkgcachegen.cc:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "एमडी५ बेरीज/MD5Sum जुळत नाही"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "हॅश बेरीज जुळत नाही"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3038,12 +3028,12 @@ msgid ""
 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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3052,7 +3042,7 @@ msgstr ""
 "मी %s पॅकेजकरीता संचिका शोधण्यास  समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते "
 "स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) "
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3061,7 +3051,7 @@ msgstr ""
 "मी %s पॅकेजकरीता संचिका शोधण्यास  समर्थ नव्हतो. याचा अर्थ असाकी तुम्हालाहे पॅकेज स्वहस्ते "
 "स्थिर/निश्चित करण्याची गरज आहे."
 
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3069,41 +3059,41 @@ msgstr ""
 "पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/"
 "ठिकाण %s."
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "आकार जुळतनाही"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "विक्रेता गट %s मध्ये बोटाचे ठसे नाहीत"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3112,41 +3102,41 @@ msgstr ""
 "सिडी-रॉमचे माउंट स्थान %s वापरुन\n"
 "सिडी-रॉम माउंट होत आहे\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "ओळखत आहे.."
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "ग्रहण केलेले नामदर्शक: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "सिडी-रॉम अनमाउंट होत आहे...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "सिडी-रॉमचे माउंट स्थान %s वापरुन\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "सिडी-रॉम अनमाउंट करत आहे\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "डिस्क/चकती करिता प्रतिक्षा करीत आहे...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "सिडी-रॉम माउंट होत आहे...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "संचिकाच्या यादी/सूचीसाठी डिस्क/चकती बारकाईने तपासत आहे..\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3155,22 +3145,22 @@ msgstr ""
 "%zu पॅकेजेसची यादी/सूची, %zu स्त्रोताची यादी/सूची, %zu भाषांतर यादी/सूची आणि %zu "
 "स्वाक्षऱ्या/सिगनेचर्स सापडल्या\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "'%s' लेबल सापडले\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "ते स्विकारण्याजोगे/वैध नांव नाही, पुन्हा प्रयत्न  करा.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3179,293 +3169,366 @@ msgstr ""
 "ह्या डिस्कला/चकतीला: म्हणतात\n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "पॅकेज सूचींच्या प्रती तयार करित आहे..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "नविन स्त्रोत सूची लिहित आहे\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "ह्या डिस्क/चकती करिता स्त्रोत सूचीच्या प्रवेशिका आहेत: \n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i माहितीसंच लिहिले.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i गहाळ संचिकाबरोबर %i माहिती संच  लिहिले.\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "%i विजोड संचिकांबरोबर %i माहिती संच लिहिले\n"
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "%i गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "%s संरचना फाईल उघडत आहे"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "हॅश बेरीज जुळत नाही"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "संस्थापन खंडित करत आहे."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "%s कार्य सापडू शकले नाही"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "%s पॅकेज सापडू शकले नाही"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "%s संस्थापित होत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "%s संरचित होत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "%s काढून टाकत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s संपूर्ण काढून टाकले"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "संस्थापना-पश्चात ट्रिगर %s चालवत आहे"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "'%s' संचयिका गहाळ आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "%s फाईल उघडता येत नाही"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "%s तयार करित आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s सुटे/मोकळे करीत आहे "
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "%s संरचने साठी तयार करत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "%s संस्थापित झाले"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "%s ला काढून टाकण्यासाठी तयारी करत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "%s काढून टाकले"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s संपूर्ण काढून टाकले"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "सत्रनोंद लिहिता येत नाही, openpty() असफल (/dev/pts आरोहित नाही?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, 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:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "%s फाईल उघडता येत नाही"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "जोडणी अकाली बंद झाली"
 
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "असंकलितकर्ता "
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "%s (नविन पॅकेज) प्रक्रिया करीत असतांना दोष आढळून आला"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "%s (वापरातील पॅकेज१) प्रक्रिया करीत असतांना दोष आढळून आला"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "%s (NewFileDesc1) वर प्रक्रिया सुरू असताना त्रुटी उद्भवली"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "%s प्रक्रिया करीत असतांना दोष आढळून आला(वापरातील पॅकेज२)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "%s(नविन संचिका आवृती१) प्रक्रिया करीत असतांना दोष आढळून आला"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "%s (नविन आवृत्ती १) प्रक्रिया करीत असतांना दोष आढळून आला"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "%s(वापरातील पॅकेज३) प्रक्रिया करीत असतांना दोष आढळून आला"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "%s (NewFileDesc2) वर प्रक्रिया सुरू असताना त्रुटी उद्भवली"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "%s (तरतूद/पुरवलेल्या संचिका जमा) प्रक्रिया करीत असतांना दोष आढळून आला"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "आंतरिक त्रुटी, मेंबर शोधता येत नाही"
 
diff --git a/po/nb.po b/po/nb.po
index fb812119e..5e5c135cc 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -22,150 +22,151 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.6.1\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Pakken %s versjon %s har et uinnfridd avhengighetsforhold:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Antall pakkenavn: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Antall pakkestrukturer: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Vanlige pakker: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Rent virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Enkle virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Sammensatte virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Mangler: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Antall unike versjoner: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Antall unike beskrivelser: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Antall avhengighetsforhold: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Antall forhold versjon/fil: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Antall forhold beskrivelse/fil: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Antall tilbudte tilknyttinger: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Antall utvidede strenger: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Total plass for avhengighetsforhold/versjoner: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Plass brukt av slark: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Samlet mengde redegjort plass: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakkefila %s er ikke oppdatert."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Fant ingen pakker"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "Du må oppgi minst ett søkemønster"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Klarer ikke å finne pakken %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Låste pakker:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(ikke funnet)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Installert: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Pakke låst til: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -240,28 +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:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 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:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Klarte ikke montere «%s» på «%s»"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 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."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Ikke parvise argumenter"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -289,12 +290,12 @@ msgstr ""
 "  -c=? Les denne innstillingsfila.\n"
 "  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s er ikke en gyldig debianpakke."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -319,40 +320,40 @@ msgstr ""
 "  -c=? Les denne innstillingsfila.\n"
 "  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Kan ikke skrive til %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Kan ikke fastslå debconf-versjonen. Er debconf installert?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Lista over pakkeutvidelser er for lang"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Feil ved lesing av katalogen %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Lista over kildeutvidelser er for lang"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Feil ved skriving av topptekst til innholdsfila"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Det oppsto en feil ved lesing av %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -434,26 +435,26 @@ msgstr ""
 "  -c=?  Les denne oppsettsfila.\n"
 "  -o=? Setter en vilkårlig innstilling"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Ingen utvalg passet"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Enkelte filer mangler i pakkegruppa «%s»"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "Databasen er ødelagt. Filnavnet er endret til %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "Databasen er gammel, forsøker å oppgradere %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -461,111 +462,111 @@ msgstr ""
 "DB-formatet er ugyldig. Hvis du oppgraderte fra en eldre versjon av apt, "
 "fjern og så gjenopprett databasen."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Klarte ikke å åpne Databasefila %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Klarte ikke å få statusen på %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Arkivet har ingen kontrollpost"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Klarte ikke å finne en peker"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A: Klarte ikke å lese katalogen %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "A: Klarte ikke å få statusen på %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "F:"
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "A:"
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "F: Det er feil ved fila"
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Klarte ikke å slå opp %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Klarte ikke å finne fram i treet"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Klarte ikke å åpne %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Klarte ikke å lese lenken %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Klarte ikke å oppheve lenken %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Klarte ikke å lenke %s til %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink-grensa på %s B er nådd.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Arkivet har ikke noe pakkefelt"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s har ingen overstyringsoppføring\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr " %s-vedlikeholderen er %s, ikke %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s har ingen kildeoverstyringsoppføring\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s har ingen binæroverstyringsoppføring heller\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Klarte ikke å tildele minne"
 
@@ -575,18 +576,18 @@ msgid "Unable to open %s"
 msgstr "Klarte ikke å åpne %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Ugyldig overstyring %s linje %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Ugyldig overstyring %s linje %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Ugyldig overstyring %s linje %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -594,63 +595,51 @@ msgstr "Ugyldig overstyring %s linje %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "Klarte ikke å lese overstyringsfila %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Ukjent komprimeringsalgoritme «%s»"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Komprimert utdata %s trenger et komprimeringssett"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Klarte ikke å opprette IPC-rør til underprosessen"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Klarte ikke å opprette FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Klarte ikke å forgreine prosess"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Komprimer barneprosess"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Intern feil, klarte ikke å opprette %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Klarte ikke å opprette underprosessen IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Klarte ikke å kjøre komprimeringen"
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "dekomprimering"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "Klarte ikke å kommunisere med underprosess/fil"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Klarte ikke å lese under utregning av MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Problem ved oppheving av lenken til %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Klarte ikke å endre navnet på %s til %s"
@@ -659,75 +648,79 @@ msgstr "Klarte ikke å endre navnet på %s til %s"
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Kompileringsfeil i regulært uttrykk - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "men %s er installert"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "men %s skal installeres"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "men lar seg ikke installere"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "men er en virtuell pakke"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "men er ikke installert"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "men skal ikke installeres"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " eller"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Følgende NYE pakker vil bli installert:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Følgende pakker vil bli FJERNET:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Følgende pakker er holdt tilbake:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Følgende pakker vil bli oppgradert:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Følgende pakker vil bli NEDGRADERT:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Følgende pakker vil bli endret:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (pga. %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -735,59 +728,59 @@ msgstr ""
 "ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n"
 "Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu oppgraderte, %lu nylig installerte, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu installert på nytt, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderte, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Merk, velger «%s» for oppgaven «%s»\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Merk, velger «%s» for det regulære uttrykket «%s»\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Pakken %s er en virtuell pakke, som oppfylt av:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Installert]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr " [Ikke versjonskandidat]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Du må velge en pakke som skal installeres."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -798,129 +791,129 @@ msgstr ""
 "Dette kan bety at pakken mangler, er utgått, eller bare finnes \n"
 "tilgjengelig fra en annen kilde.\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Følgende pakker erstatter den imidlertid:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Pakken «%s» har ingen installasjonskandidat"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "Virtuelle pakker som «%s» kan ikke fjernes\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Merk, velger «%s» istedenfor «%s»\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Hopper over %s siden den ikke er installert eller kun oppgraderinger er "
 "ønsket.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s er allerede nyeste versjon.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s satt til manuell installasjon.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Retter på avhengighetsforhold ..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " mislyktes."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Klarer ikke å rette på avhengighetsforholdene"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Klarer ikke å minimere oppgraderingsettet"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Utført"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Du vil kanskje kjøre «apt-get -f install» for å rette på dette."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Autentiseringsadvarsel overstyrt.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Installer disse pakkene uten verifikasjon [j/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Noen pakker ble ikke autentisert"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakker trenges å fjernes, men funksjonen er slått av."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern feil, sortering fullførte ikke"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Så rart ... Størrelsene stemmer ikke overens, send en e-post til "
@@ -928,53 +921,53 @@ 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Må hente %sB/%sB med arkiver.\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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Må hente %sB med arkiver.\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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 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:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Klarte ikke bestemme ledig plass i %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Dessverre, ikke nok ledig plass i %s"
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "«Bare trivielle endringer» ble angitt, men dette er ikke en triviell endring."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Ja, gjør som jeg sier!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -985,28 +978,28 @@ msgstr ""
 "For å fortsette skriv inn teksten «%s»\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Avbryter."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du fortsette [Y/n]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikke å skaffe %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Klarte ikke laste ned alle filene"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Nedlasting fullført med innstillinga «bare nedlasting»"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1014,19 +1007,19 @@ msgstr ""
 "Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller "
 "«--fix-missing»."
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "«--fix-missing» og bytte av media støttes nå ikke"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Klarer ikke å rette på manglende pakker."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Avbryter installasjonen."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1040,35 +1033,35 @@ msgstr[1] ""
 "De følgende pakkene forsvant fra systemet ditt siden\n"
 "alle filene er overskrevet av andre pakker:"
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Merk: Dette er gjort automatisk og med hensikt av dpkg."
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Ignorer utilgjengelig målutgave «%s» av pakke «%s»"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Velger «%s» som kildepakke istedenfor «%s»\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Ignorer utilgjengelig versjon «%s» av pakke «%s»"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Oppdaterings-kommandoen tar ingen argumenter"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1086,15 +1079,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "Følgende informasjon kan være til hjelp med å løse problemet:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern feil, autofjerneren (AutoRemover) ødela noe"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1105,7 +1098,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Følgende pakker ble automatisk installert og er ikke lenger påkrevet:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1113,19 +1106,19 @@ msgid_plural ""
 msgstr[0] "%lu pakke ble automatisk installert og er ikke lenger påkrevet.\n"
 msgstr[1] "%lu pakker ble automatisk installert og er ikke lenger påkrevet.\n"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Bruk «apt-get autoremove» for å fjerne dem."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern feil - «AllUpgrade» ødela noe"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Du vil kanskje utføre «apt-get -f install» for å rette på disse:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1133,7 +1126,7 @@ msgstr ""
 "Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller "
 "angi en løsning)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1145,73 +1138,73 @@ msgstr ""
 "at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n"
 "distribusjonen."
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Ødelagte pakker"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Følgende ekstra pakker vil bli installert."
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Foreslåtte pakker:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Anbefalte pakker"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Klarte ikke å finne pakken %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s satt til automatisk installasjon.\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Beregner oppgradering... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Mislyktes"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Utført"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil, problemløser ødela noe"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Klarer ikke å låse nedlastingsmappa"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 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:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Klarer ikke å finne en kildekodepakke for %s"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1220,7 +1213,7 @@ msgstr ""
 "MERK: «%s»-pakker blir vedlikeholdt i versjonskontrollsystemet «%s» på:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1231,106 +1224,106 @@ msgstr ""
 "bzr get %s\n"
 "for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n"
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hopper over allerede nedlastet fil «%s»\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Skaffer kildekode %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikke å skaffe alle arkivene."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen «%s» mislyktes.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, 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:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggekommandoen «%s» mislyktes.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Barneprosessen mislyktes"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 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:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, 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:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen avhengigheter.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, 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:2889
+#: cmdline/apt-get.cc:2924
 #, 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:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1339,37 +1332,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:2957
+#: cmdline/apt-get.cc:2992
 #, 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:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s"
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s."
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikke å behandle forutsetningene for bygging"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Kobler til %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Støttede moduler:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1458,7 +1451,7 @@ msgstr ""
 "for mer informasjon og flere valg.\n"
 "                       Denne APT har kraften til en Superku.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1470,33 +1463,33 @@ msgstr ""
 "      Husk også at låsing er deaktivert, så ikke regn med \n"
 "      relevans i forhold til den reelle gjeldende situasjonen."
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Funnet "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Hent:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ign "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Feil "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Hentet %sB på %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Arbeider]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1507,46 +1500,62 @@ msgstr ""
 "  «%s»\n"
 "i «%s» og trykk «Enter»\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "men er ikke installert"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s satt til manuell installasjon.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s satt til automatisk installasjon.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s er allerede nyeste versjon.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s er allerede nyeste versjon.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s satt til manuell installasjon.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Klarte ikke å åpne %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1568,11 +1577,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Ukjent pakkeoppføring"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1633,197 +1642,199 @@ msgstr "av betydning. Sett dem i stand dem og kjør [I]nstall igjen."
 msgid "Merging available information"
 msgstr "Fletter tilgjengelig informasjon"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Klarte ikke å opprette rør"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Klarte ikke å kjøre gzip "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Ødelagt arkiv"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar-sjekksummen mislykkes, arkivet er ødelagt"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Ukjent TAR-hode: type %u, medlem %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Ugyldig arkivsignatur"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Feil ved lesing av arkivmedlemshode"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "Ugyldig arkivmedlemshode %s"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Ugyldig arkivmedlemshode"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Arkivet er for kort"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Klarte ikke å lese arkivhodene"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "DropNode ble startet på et knutepunkt som ennå er lenket"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Fant ikke nøkkelelementet."
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Klarte ikke å tildele avledning"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Intern feil i AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Prøver å skrive over en avledning, %s -> %s og %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Dobbel tillegging av avledning %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Dobbel oppsettsfil %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Klarte ikke å skrive fila %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Klarte ikke å lukke fila %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Stien %s er for lang"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Pakker ut %s mer enn en gang"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Katalogen %s er avledet"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Avledningsstien er for lang"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "Fant ikke knutepunktet i dens hash-spann"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Stien er for lang"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Skriver over pakketreff uten versjon for %s"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, 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"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Klarer ikke å lese %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Klarte ikke å få statusen på %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Klarte ikke å fjerne %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Klarte ikke å opprette %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Klarte ikke å få statusen på %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "Infokatalogen og den midlertidige katalogen må være på det samme filsystemet"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Leser pakkelister"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Klarte ikke å bytte til adminkatalogen %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Intern feil ved henting av pakkenavn"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Les filliste"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1834,115 +1845,116 @@ msgstr ""
 "denne fila, bør du opprette den som en tom fil og installere den samme "
 "versjonen av pakken på nytt."
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Klarte ikke å lese listefila %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Intern feil ved henting av node"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Klarte ikke å åpne avledningsfila %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "Avledningsfila er ødelagt"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Ugyldig linje i avledningsfila: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Det oppsto en intern feil når avledningen ble lagt til"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "Pakkelageret må klargjøres først"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Fant ikke «Package:»-linje, offset %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Ødelagt «ConfFile»-del i statusfila. Offset %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Feil ved tolking av MD5. Offset %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Dette er ikke et gyldig DEB-arkiv, mangler «%s»-medlemmet"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 "Dette er ikke et gyldig DEB-arkiv, det har ikke noe «%s»-, «%s»- eller «%s»-"
 "medlem"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Klarte ikke å bytte til %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Intern feil, fant ikke medlemmet %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Fant ingen gyldig kontrollfil"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Kontrollfila kan ikke tolkes"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Klarte ikke å åpne rør for %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Lesefeil fra %s-prosessen"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Klarte ikke å få status"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Klarte ikke å sette endringstidspunkt"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Klarer ikke å lese CD-databasen %s"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1950,58 +1962,58 @@ msgstr ""
 "Bruk «apt-cdrom» for å gjøre denne CD-plata tilgjengelig for APT. Du kan "
 "ikke bruke «apt-get update» til å legge til nye CD-plater."
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "Feil CD-plate"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 "Klarer ikke å avmontere CD-plata i %s. Det kan hende plata fremdeles er i "
 "bruk."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Disk ikke funnet."
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Fant ikke fila"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Ugyldig adresse. Lokale adresser kan ikke starte med //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Logger inn"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Klarte ikke å fastslå navnet på motparten"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Klarte ikke å fastslå det lokale navnet"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Tjeneren nektet oss å kople til og sa: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER mislykkes, tjeneren sa: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS mislykkes, tjeneren sa: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2009,197 +2021,197 @@ msgstr ""
 "En mellomtjener er oppgitt, men ikke noe innloggingsskript. Feltet «Acquire::"
 "ftp::ProxyLogin» er tomt."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Kommandoen «%s» i innlogginsskriptet mislykkes, tjeneren sa: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE mislykkes, tjeneren sa: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Tidsavbrudd på forbindelsen"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Tjeneren lukket forbindelsen"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Lesefeil"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Et svar oversvømte bufferen."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Protokollødeleggelse"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Skrivefeil"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Klarte ikke å opprette en sokkel"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "Klarte ikke å kople til datasokkelen, tidsavbrudd på forbindelsen"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Klarte ikke å koble til en passiv sokkel."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo klarte ikke å opprette en lyttesokkel"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Klarte ikke å binde til sokkel"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Klarte ikke å lytte til sokkel"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Klarte ikke å avgjøre sokkelnavnet"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Klarte ikke å sende PORT-kommandoen"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Ukjent adressefamilie %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT mislykkes, tjeneren sa: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Tidsavbrudd på tilkoblingen til datasokkelen"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Klarte ikke å godta tilkoblingen"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av nøkkel for fil"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Klarte ikke å hente fila, tjeneren sa «%s»"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Tidsavbrudd på datasokkelen"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Dataoverføringen mislykkes, tjeneren sa «%s»"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Spørring"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Klarte ikke å starte"
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Kobler til %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Klarte ikke å starte forbindelsen til %s:%s (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Kobler til %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Klarte ikke å slå opp «%s»"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Midlertidig feil ved oppslag av «%s»"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, 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:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Klarte ikke koble til %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Intern feil: God signatur, men kunne bestemme nøkkelfingeravtrykk?!"
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Minst en ugyldig signatur ble funnet."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Ukjent feil ved kjøring av gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "De følgende signaturene var ugyldige:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2207,106 +2219,111 @@ msgstr ""
 "De følgende signaturene kunne ikke verifiseres fordi den offentlige nøkkelen "
 "ikke er tilgjengelig:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Venter på hoder"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Fikk en enkel hodelinje over %u tegn"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Ødelagt hodelinje"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-tjeneren sendte et ugyldig svarhode"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-tjeneren sendte et ugyldig «Content-Length»-hode"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-tjeneren sendte et ugyldig «Content-Range»-hode"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Denne HTTP-tjeneren har ødelagt støtte for område"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Ukjent datoformat"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Utvalget mislykkes"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Tidsavbrudd på forbindelsen"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Feil ved lesing fra tjeneren"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Klarte ikke forkorte fila %s"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Ødelagte hodedata"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkes"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Kan ikke utføre mmap på en tom fil"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Klarte ikke duplisere fildeskriptor %i"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Klarte ikke lage mmap av %lu bytes"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "Klarte ikke lukke mmap"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "Klarte ikke synkronisere mmap"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Klarte ikke lage mmap av %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Klarte ikke forkorte fila %s"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2315,7 +2332,7 @@ msgstr ""
 "Dynamisk MMap gikk tom for minne. Øk størrelsen på APT::Cache-Limit. "
 "Nåværende verdi: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2324,7 +2341,7 @@ msgstr ""
 "Klarte ikke øke størrelsen på MMap-en siden grensen på %lu byte allerede er "
 "nådd."
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2355,93 +2372,93 @@ msgstr "%lim %lis"
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Fant ikke utvalget %s"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Ukjent typeforkortelse: «%c»"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Åpner oppsettsfila %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaksfeil %s:%u: Blokka starter uten navn."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntaksfeil %s:%u: Feil på taggen"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntaksfeil %s:%u: Ugyldige angivelser etter verdien"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Syntaksfeil %s:%u: Direktivene kan bare ligge i det øverste nivået"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntaksfeil %s:%u: For mange nøstede inkluderte filer"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntaksfeil %s:%u: Inkludert herfra"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaksfeil %s:%u: Direktivet «%s» er ikke støttet"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr "Syntaksfeil %s:%u: clear-direktivet krever et valgtre som argument"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntaksfeil %s:%u: Ugyldige angivelser på slutten av fila"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s ... Feil"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s ... Ferdig"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Kjenner ikke kommandolinjevalget «%c» (fra %s)."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Skjønner ikke kommandolinjevalget %s"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Kommandolinjevalget %s er ikke boolsk"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Valget %s krever et argument."
@@ -2451,336 +2468,349 @@ msgstr "Valget %s krever et argument."
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Valg %s: Angivelsen av oppsettselementet må ha en =<verdi>."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Valget %s må ha et heltallsargument, ikke «%s»"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Valget «%s» er for langt"
 
-#: 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 "Skjønner ikke %s. Prøv «true» eller «false»."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Ugyldig operasjon %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Klarer ikke å fastsette monteringspunktet %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Klarer ikke å endre %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Klarer ikke å få statusen på CD-spilleren"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Klarte ikke åpne låsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Får ikke låst %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Ventet på %s, men den ble ikke funnet"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprosessen %s mottok et minnefeilsignal."
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Underprosessen %s mottok signalet %u."
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprosessen %s ga en feilkode (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprosessen %s avsluttet uventet"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Klarte ikke åpne fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Klarte ikke åpne fildeskriptor %d"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Klarte ikke å opprette underprosessen IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Klarte ikke å kjøre komprimeringen"
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, 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:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, 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:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problem ved låsing av gzip-fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem ved låsing av fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, 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:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem ved oppheving av lenke til fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Problem ved oppdatering av fila"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Tomt pakkelager"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Pakkens lagerfil er ødelagt"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "Pakkens lagerfil er av feil versjon (samvirker ikke)"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Pakkens lagerfil er ødelagt"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Denne APT støtter ikke versjonssystemet «%s»"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "Pakkelageret ble bygd for en annen arkitektur"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Avhenger av"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Forutsetter"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Foreslår"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Anbefaler"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Er i konflikt med"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Erstatter"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Nuller"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Ødelegger"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "Forbedrer"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "viktig"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "påkrevet"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "vanlig"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "valgfri"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "tillegg"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Skaper oversikt over avhengighetsforhold"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Versjons-kandidater"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Oppretter avhengighetsforhold"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Leser tilstandsinformasjon"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Klarte ikke å åpne StateFile %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Klarte ikke å skrive midlertidig StateFile %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Klarer ikke å fortolke pakkefila %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Klarer ikke å fortolke pakkefila %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "Feil på linje %lu i kildelista %s ([valg] ikke tolkbar)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Feil på linje %lu i kildelista %s ([valg] for kort)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Feil på linje %lu i kildelista %s ([%s] er ingen tilordning)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Feil på linje %lu i kildelista %s ([%s] har ingen nøkkel)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "Feil på linje %lu i kildelista %s ([%s] nøkkel %s har ingen verdi)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Feil på linje %lu i kildelista %s (nettadresse)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Feil på linje %lu i kildelista %s (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Feil på %lu i kildelista %s (Absolutt dist)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Feil på %lu i kildelista %s (dist fortolking)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Åpner %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Linje %u i kildelista %s er for lang"
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Feil på %u i kildelista %s (type)"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2789,7 +2819,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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Klarte ikke åpne fila «%s»"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2800,28 +2835,19 @@ msgstr ""
 "%s pga. en konflikt/forutsettelses-løkke. Dette er ofte stygt, men hvis du "
 "virkelig vil det, så bruk innstillingen APT::Force-LoopBreak."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"Klarte ikke gjennomføre umiddelbar konfigurasjon av allerede utpakket «%s». "
-"Se man 5 apt.conf under APT::Immediate-Configure for detaljer."
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Oversiktsfil av typen «%s» støttes ikke"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 "Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2829,11 +2855,11 @@ msgstr ""
 "Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker "
 "som holdes tilbake."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 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:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2842,234 +2868,196 @@ msgstr ""
 "Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle "
 "ble brukt isteden. "
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Listemappa %spartial mangler."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Arkivmappa %spartial mangler."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "Klarte ikke låse mappa %s"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Henter fil %li av %li (%s gjenværende)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Henter fil %li av %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Finner ikke metode-driveren %s."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s startet ikke korrekt"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Pakkesystemet «%s» støttes ikke"
 
-#: apt-pkg/init.cc:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Klarer ikke bestemme en passende pakkesystemtype"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Klarer ikke finne informasjonom %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 "Beklager, du må legge inn noen kilder (nettadresser) i din «sources.list»."
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Pakkelista eller tilstandsfila kunne ikke fortolkes eller åpnes."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Det kan hende du vil kjøre «apt-get update» for å rette på disse problemene"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Kan ikke lese kildlista."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Ugyldig oppslag i foretrekksfila %s, manglende pakkehode"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Forsto ikke spikring av typen %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Ingen prioritet (eller null) spesifisert for pin"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Lageret har et uoverensstemmende versjonssystem"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Feil oppsto under behandling av %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Feil oppsto under behandling av %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Feil oppsto under behandling av %s (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Feil oppsto under behandling av %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Feil oppsto under behandling av %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Feil oppsto under behandling av %s (NewVersion%d)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Feil oppsto under behandling av %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Feil oppsto under behandling av %s (NewFileDesc2)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Feil oppsto under behandling av %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Jøss, du har overgått antallet pakkenavn denne APT klarer."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Jøss, du har overgått antallet versjoner denne APT klarer."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Jøss, du har overgått antallet beskrivelser denne APT klarer."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 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:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Feil oppsto under behandling av %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Feil oppsto under behandling av %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Samler inn filtilbud"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "IO-feil ved lagring av kildekode-lager"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "klarte ikke å endre navnet, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "Feil MD5sum"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Hashsummen stemmer ikke"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, 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:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3079,12 +3067,12 @@ msgstr ""
 "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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-feil: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3093,7 +3081,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:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3102,47 +3090,47 @@ msgstr ""
 "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne denne "
 "pakken selv."
 
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1768
 #, 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:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Feil størrelse"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Klarer ikke å fortolke Release-fila %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Ingen avsnitt i Release-fila %s"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Ingen sjekksumoppføring i Release-fila %s"
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, 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:125
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ugyldig «Date»-oppføring i Release-fila %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Utgivers blokk %s inneholder ikke no fingeravtrykk"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3151,41 +3139,41 @@ msgstr ""
 "Bruker CD-ROM monteringspunkt %s\n"
 "Monterer CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Indentifiserer.."
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Lagret merkelapp: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "Avmonterer CD-ROM ...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Bruker CD-ROM monteringspunkt %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Avmonterer CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Venter på CD-en...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Monterer CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Leter gjennom CD for indeksfiler..\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3194,7 +3182,7 @@ msgstr ""
 "Fant %zu pakkeindekser, %zu kildeindekser, %zu oversettelsesindekser og %zu "
 "signaturer\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3202,16 +3190,16 @@ msgstr ""
 "Klarte ikke finne noen Package-filer. Kanskje dette ikke er en Debian Disc "
 "eller du har valgt feil arkitektur?"
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Fant merkelapp «%s»\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Det er ikke et gyldig navn, prøv igjen.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3220,90 +3208,90 @@ msgstr ""
 "CD-en er kalt: \n"
 "«%s»\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Kopierer pakkelister..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Skriver ny kildeliste\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "Kildelisteoppføringer for denne CD-en er:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skrev %i poster med %i manglende filer.\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Skrev %i poster med %i feile filer.\n"
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, 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"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Hopper over den ikke-eksisterende fila %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Klarte ikke finne autentiseringsoppføring for: %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hashsummen stemmer ikke for: %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "Ingen nøkkelring installert i %s."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Utgave «%s» av «%s» ble ikke funnet"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versjon «%s» av «%s» ble ikke funnet"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Klarte ikke å finne oppgave «%s»"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Klarte ikke finne noen pakken med regex «%s»"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "Klarte ikke velge versjoner fra pakken «%s» siden den er kun virtuell"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3312,125 +3300,149 @@ msgstr ""
 "Klarte ikke velge installert eller kandidatversjon fra pakken «%s» siden den "
 "har ingen av dem"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Klarte ikke velge nyeste versjon fra pakken «%s» siden den er kun virtuell"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Klarte ikke velge kandidatversjon fra pakken «%s» siden den ikke har noen "
 "kandidat"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Klarte ikke velge installert versjon fra pakken «%s» siden den ikke er "
 "installert"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "Installerer %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Setter opp %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Fjerner %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "Fjerner %s fullstendig"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Legger merke til at %s forsvinner"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Mappa «%s» mangler"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Klarte ikke åpne fila «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Forbereder %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Pakker ut %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Forbereder oppsett av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "Installerte %s"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Forbereder fjerning av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "Fjernet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Forbereder å fullstendig slette %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "Fjernet %s fullstendig"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "Kjører dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "avhengighetsproblemer - lar den være uoppsatt"
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3438,7 +3450,7 @@ msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en "
 "følgefeil fra en tidligere feil."
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3446,7 +3458,7 @@ msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
 "feil"
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3454,13 +3466,13 @@ msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for "
 "minne»-feil"
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «dpkg I/O»-feil"
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3468,43 +3480,43 @@ msgid ""
 msgstr ""
 "Klarte ikke låse den administrative mappen (%s). Bruker en annen prosess den?"
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Klarte ikke låse den administrative mappen (%s). Er du root?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet,"
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Ikke låst"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "Ingen speilfil «%s» funnet"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Ingen speilfil «%s» funnet"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Speil: %s]"
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3513,7 +3525,7 @@ msgstr ""
 "Klarte ikke rette %s med mmap og med filoperasjonbruk - programrettelsen ser "
 "ut til å være korrupt."
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3522,10 +3534,68 @@ msgstr ""
 "Klarte ikke rette %s med mmap (men ingen mmap-spesifikk feil) - "
 "programrettelsen ser ut til å være korrupt."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Forbindelsen ble uventet stengt"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Merk: Dette er gjort automatisk og med hensikt av dpkg."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Ugyldig overstyring %s linje %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Ugyldig overstyring %s linje %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Ugyldig overstyring %s linje %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "dekomprimering"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "lese, har fremdeles %lu igjen å lese, men ingen igjen"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "skrive, har fremdeles %lu igjen å skrive, men klarte ikke å"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "Klarte ikke gjennomføre umiddelbar konfigurasjon av allerede utpakket "
+#~ "«%s». Se man 5 apt.conf under APT::Immediate-Configure for detaljer."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Feil oppsto under behandling av %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Feil oppsto under behandling av %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Feil oppsto under behandling av %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Feil oppsto under behandling av %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Feil oppsto under behandling av %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Feil oppsto under behandling av %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Feil oppsto under behandling av %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Feil oppsto under behandling av %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Feil oppsto under behandling av %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Feil oppsto under behandling av %s (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Intern feil, fant ikke medlem"
 
diff --git a/po/ne.po b/po/ne.po
index 2b0dc63a0..83d6964ab 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt_po\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -17,153 +17,154 @@ msgstr ""
 "Plural-Forms: nplurals=2;plural=(n!=1)\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "प्याकेज %s संस्करण %s संग एउटा नभेटिएको dep छ:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "कूल प्याकेज नामहरू :"
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 #, fuzzy
 msgid "Total package structures: "
 msgstr "कूल प्याकेज नामहरू :"
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  सामान्य प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "शुद्ध अवास्तविक प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  एकल अवास्तविक प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  मिश्रित अवास्तविक प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  हराइरहेको:"
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "कूल भिन्न संस्करणहरू:"
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "कूल भिन्न संस्करणहरू:"
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "कूल निर्भरताहरू:"
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "जम्मा ver/file सम्बन्धहरू: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "जम्मा ver/file सम्बन्धहरू: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "कूल उपलब्ध मानचित्रणहरू:"
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "कूल विश्वव्यापी स्ट्रिङ्गहरू:"
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "कूल निर्भरता संस्करण खाली ठाऊँ:"
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "कूल शिथिल खाली ठाऊँ:"
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "को लागि कूल खाली ठाऊँ लेखांकन:"
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "प्याकेज फाइल %s sync भन्दा बाहिर छ ।"
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "कुनै प्याकेजहरू फेला परेन"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "तपाईँले एउटा वास्तविक बान्की दिनुपर्छ"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "प्याकेज %s तोक्न असक्षम भयो"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "प्याकेज फाइलहरू:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "पिन गरिएका प्याकेजहरू:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(फेला परेन)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  स्थापना भयो:"
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  उमेद्वार:"
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(कुनै पनि होइन)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "प्याकेज पिन:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  संस्करण तालिका:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -237,29 +238,29 @@ msgstr ""
 "  -o=? एउटा स्वेच्छाचारी कनफिगरेसन फाइल सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
 "धेरै जानकारीकोप लागि apt-cache(8) र apt.conf(5) म्यानुल पृष्टहरू हेर्नुहोस्  ।\n"
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 #, 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:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "कृपया ड्राइभमा डिस्क घुसाउनुहोस् र इन्टर थिच्नुहोस्"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr " %s मा  %s  पुन:नामकरण असफल भयो"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "तपाईँको सेटमा बाँकी सि डि हरुको लागि यो प्रक्रिया फेरी गर्नुहोस् । "
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "तर्कहरू जोडामा छैन"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -287,12 +288,12 @@ msgstr ""
 "  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
 "  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s वैध DEB प्याकेज होइन"
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -316,40 +317,40 @@ msgstr ""
 "  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
 "  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr " %s मा लेख्न असक्षम"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? "
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "प्याकेज विस्तार सूचि अति लामो छ"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "स्रोत विस्तार सूचि अति लामो छ"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "सामाग्री फाइलहरुमा हेडर लेख्दा त्रुटि"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "सामग्री %sप्रक्रिया गर्दा त्रुटि"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -432,136 +433,136 @@ msgstr ""
 "  -c=?  यो कनफिगरेसन फाइल पढ्नुहोस्\n"
 "  -o=?  एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "कुनै चयनहरू मेल खाएन"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "केही फाइलहरू प्याकेज फाइल समूह `%s' मा हराइरहेको छ"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "DB दूषित थियो, फाइल %s.पुरानो मा पुन:नामकरण गर्नुहोस्"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB पुरानो छ, %s स्तरवृद्धि गर्न प्रयास गरिदैछ"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "DB फाइल %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr " %s स्थिर गर्न असफल"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "संग्रह संग नियन्त्रण रेकर्ड छैन"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "कर्सर प्राप्त गर्न असक्षम भयो"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: डाइरेक्ट्री %s पढ्न असक्षम\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: %s स्थिर गर्न असक्षम\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: फाइलमा त्रुटिहरू लागू गर्नुहोस्"
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "%s हल गर्न असफल भयो"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "ट्री हिडाईँ असफल भयो"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "%s खोल्न असफल"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "लिङ्क पढ्न असफल %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "अनलिङ्क गर्न असफल %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** %s मा %s लिङ्क असफल भयो"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr "यस %sB हिटको डि लिङ्क सिमा।\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "संग्रह संग कुनै प्याकेज फाँट छैन"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: 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:713
+#: ftparchive/writer.cc:721
 #, fuzzy, c-format
 msgid "  %s has no source override entry\n"
 msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, fuzzy, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - स्मृति बाँडफाँड गर्न असफल भयो"
 
@@ -571,18 +572,18 @@ msgid "Unable to open %s"
 msgstr "%s खोल्न असफल"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #१"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #२"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #३"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -590,63 +591,51 @@ msgstr "वैरुप्य गरिएको अधिलेखन  %s र�
 msgid "Failed to read the override file %s"
 msgstr "अधिलेखन फाइल पढ्न असफल %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "अज्ञात सङ्कुचन अल्गोरिद्म '%s'"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "सङ्कुचन गरिएको निर्गात %s लाई सङ्कुचन सेटको आवश्यक्ता पर्दछ"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "सहायक प्रक्रियामा IPC पाइप सिर्जना गर्न असफल"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "FILE* सिर्जना गर्न असफल"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "काँटा गर्न असफल"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "सङ्कुचन शाखा"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "आन्तरीक त्रुटि, %s सिर्जना गर्न असफल"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "सहायक प्रक्रिया IPC सिर्जना गर्न असफल"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "सङ्कुचनकर्ता कार्यान्वयन गर्न असफल भयो"
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "सङ्कुचनविहिन कर्ता"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "सहायक प्रक्रिया/फाइलमा IO असफल भयो"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "MD5 गणना गर्दा पढ्न असफल भयो"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "समस्या अनलिङ्क भइरहेछ %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr " %s मा  %s  पुन:नामकरण असफल भयो"
@@ -655,75 +644,79 @@ msgstr " %s मा  %s  पुन:नामकरण असफल भयो"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "तर %s स्थापना भयो"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "तर %s स्थापना हुनुपर्यो"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "तर यो स्थापनायोग्य छैन"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "तर यो अवास्तविक प्याकेज होइन"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "तर यो स्थापना भएन"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "तर यो स्थापना हुन गइरहेको छैन"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr "वा"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "निम्न प्याकेजहरू हटाइनेछन्:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (%s कारणले) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -731,60 +724,60 @@ msgstr ""
 "चेतावनी: निम्न आवश्यक प्याकेजहरू हटाइनेछन् ।\n"
 "तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu पुन: स्थापना गरियो, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu स्तर कम गरियो, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "प्याकेज %s ...द्वारा उपलब्ध गराइएको अवास्तविक प्याकेज हो:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [स्थापना भयो]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 #, fuzzy
 msgid " [Not candidate version]"
 msgstr "उमेद्वार संस्करणहरू"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "तपाईँले स्थापना गर्न स्पष्ट रुपमा एउटा चयन गर्नुहोस् ।"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -795,177 +788,177 @@ msgstr ""
 "यसको मतलब प्याकेज हराइरहेको प्याकेज, बेकायम भयो\n"
 " अर्को स्रोतबाट मात्र उपलब्ध हुन्छ\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "जे भए पनि निम्न प्याकेजहरूले यसलाई बदल्छ:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "प्याकेज %s संग कुनै स्थापना उमेद्वार छैन"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "द्रष्टब्य, %s को सट्टा  %s चयन भइरहेछ\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr " %s को पुन: स्थापना सम्भव छैन, यो डाउनलोड हुन सक्दैन ।\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "तर %s स्थापना हुनुपर्यो"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "निर्भरताहरू सुधार गरिदैछ..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr "असफल भयो ।"
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "निर्भरताहरू सुधार गर्न असक्षम भयो"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "स्तर वृद्धि सेटलाई न्यूनतम गर्न असक्षम भयो"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr "काम भयो"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "यी सुधार गर्न तपाईँले 'apt-get -f install' चलाउन पर्छ ।"
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "नभेटिएका निर्भरताहरू । -f प्रयोग गरेर प्रयास गर्नुहोस् ।"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "चेतावनी: निम्न प्याकलेजहरू प्रणाणीकरण हुन सक्दैन! "
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "प्रमाणिकरण चेतावनी अधिलेखन भयो ।\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "यी प्याकेजहरू रूजू बिना स्थापना गर्नुहुन्छ [y/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "केही प्याकेजहरू प्रमाणीकरण हुन सक्दैन"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "त्यहाँ समस्याहरू छन् र हुन्छलाई जोड नगरिकन -y को प्रयोग भयो"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "आन्तरिक त्रुटि, स्थापना प्याकेजहरुलाई भाँचिएको प्याकेज भनिन्थ्यो!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "प्याकेजहरू हट्न चाहदैछन् तर हटाई अक्षम भइरहेछ ।"
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "कस्तो नमिलेको.. साइजहरू मेल खाएन, apt@packages.debian.org इमेल गर्नुहोस्"
 
 #. 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:1142
+#: cmdline/apt-get.cc:1156
 #, 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:1147
+#: cmdline/apt-get.cc:1161
 #, 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:1154
+#: cmdline/apt-get.cc:1168
 #, 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:1159
+#: cmdline/apt-get.cc:1173
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n"
 
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन ।"
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "त्रिभियल मात्र निर्दिष्ट गरिएको छ तर यो त्रिभियल सञ्चालन होइन ।"
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "हो,मैले भने जस्तै गर्नुहोस्!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -976,28 +969,28 @@ msgstr ""
 "निरन्तरता दिन '%s' वाक्यांशमा टाइप गर्नुहोस् \n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "परित्याग गर्नुहोस् ।"
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s तान्न असफल भयो\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1005,19 +998,19 @@ msgstr ""
 "केही संग्रहहरू तान्न असक्षम भयो,apt-get अद्यावधिक चलिरहेछ वा हराइरहेको --fix-संगै प्रयास "
 "गर्नुहुन्छ ?"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "हराइरहेको --fix-र स्वाप भइरहेको मेडिया हाल समर्थित भइरहेको छैन"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "हराइरहेको प्याकेजहरू सुधार्न असक्षम भयो ।"
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "स्थापना परित्याग गरिदैछ ।"
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1027,35 +1020,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1071,16 +1064,16 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: "
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1090,7 +1083,7 @@ msgid_plural ""
 msgstr[0] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1098,19 +1091,19 @@ msgid_plural ""
 msgstr[0] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "तपाईँ यसलाई सुधार गर्न 'apt-get -f install' चलाउन चाहनुहुन्छ:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1118,7 +1111,7 @@ msgstr ""
 "नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा "
 "समाधान निर्दिष्ट गर्नुहोस्) ।"
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1131,80 +1124,80 @@ msgstr ""
 " वितरण अहिले सम्म सिर्जना\n"
 " भएको छैन वा आवगमन विनानै सर्यो ।"
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "भाँचिएका प्याकेजहरू"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "सुझाव दिएका प्याकेजहरू:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "सिफारिस गरिएका प्याकेजहरू:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "तर %s स्थापना हुनुपर्यो"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "स्तर वृद्धि गणना गरिदैछ..."
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "असफल भयो"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "काम भयो"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
 
-#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1212,104 +1205,104 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "स्रोत फड्काउनुहोस् %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "केही संग्रह फड्काउन असफल भयो ।"
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n"
 
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "अनप्याक आदेश '%s' असफल भयो ।\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
 
-#: cmdline/apt-get.cc:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "निर्माण आदेश '%s' असफल भयो ।\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "शाखा प्रक्रिया असफल भयो"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ"
 
-#: cmdline/apt-get.cc:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो"
 
-#: cmdline/apt-get.cc:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, 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:2889
+#: cmdline/apt-get.cc:2924
 #, 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:2912
+#: cmdline/apt-get.cc:2947
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ"
 
-#: cmdline/apt-get.cc:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1318,37 +1311,37 @@ msgstr ""
 "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण "
 "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन "
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, 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:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s"
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । "
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "%s (%s) मा जडान गरिदैछ"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "समर्थित मोड्युलहरू:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1433,7 +1426,7 @@ msgstr ""
 "pages हेर्नुहोस् ।\n"
 "                       APT संग सुपर काउ शक्तिहरू छ ।\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1441,33 +1434,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "हान्नुहोस्"
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "प्राप्त गर्नुहोस्:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ign "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Err "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%s (%sB/s) मा %sB मा तानियो\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [काम गरिरहेको]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1478,46 +1471,62 @@ msgstr ""
 " '%s'\n"
 "र इन्टर थिच्नुहोस्\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "तर यो स्थापना भएन"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "तर %s स्थापना हुनुपर्यो"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "तर %s स्थापना हुनुपर्यो"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "तर %s स्थापना हुनुपर्यो"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "%s खोल्न असफल"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1539,11 +1548,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "अज्ञात प्याकेज रेकर्ड!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1605,196 +1614,198 @@ msgstr ""
 msgid "Merging available information"
 msgstr "उपलब्ध सूचना गाँभिदैछ"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "पाइपहरू सिर्जना गर्न असफल"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "gzip कार्यन्वयन गर्न असफल"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "संग्रह दूषित भयो"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "टार चेकसम असफल भयो, संग्रह दूषित भयो"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "अज्ञात टार हेडर प्रकार %u, सदस्य %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "अवैध संग्रह हस्ताक्षर"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "संग्रह सदस्य हेडर पढ्दा त्रुटि "
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, fuzzy, c-format
 msgid "Invalid archive member header %s"
 msgstr "अवैध संग्रह सदस्य हेडर"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "अवैध संग्रह सदस्य हेडर"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "संग्रह अति छोटो छ"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "संग्रह हेडरहरू पढ्न असफल"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "अहिलेसम्म लिङ्क गरिएको नोडमा बोलाइएको ड्रपनोड"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "ह्यास तत्व तोक्न असफल भयो"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "मोड बाँड्न असफल भयो"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "थपमोडमा आन्तरिक त्रुटि"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "मोड अधिलेखन गर्ने प्यास गरिदै, %s -> %s र %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "मोडको डबल थप %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "नक्कली कनफिगगरेसन फाइल %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "फाइल %s लेख्न असफल भयो"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "%s फाइल बन्द गर्न असफल भयो"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "बाटो %s अति लामो छ "
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "एक भन्दा बढी %s अनप्याक गरिदैछ"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "डाइरेक्ट्री %s फेरियो "
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "प्याकेज लक्षित मोडमा लेख्ने प्यास गर्दैछ %s/%s"
 
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "घुम्ती बाटो अति लामो छ"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "डाइरेक्ट्री %s डाइरेक्ट्री विहिन द्वारा बदलिदैछ"
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "यसको ह्यास बाल्टीमा नोड स्थित गर्न असफल भयो"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "बाटो अति लामो छ"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr " %s को लागि संस्करन बिना अधिलेखन प्याकेज मेल खायो"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा अधिलेखन गर्दछ"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "%s पढ्न असफल भयो"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "%s स्थिर गर्न असक्षम भयो"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "%s लाई फेरी सार्न असफल भयो"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "%s सिर्जना गर्न असफल भयो"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "%sinfo स्थिर गर्न असफल भयो"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "सूचना र टेम्प डाइरेक्ट्रीहरू एउटै फाइल प्रणालीमा हुनपर्छ"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "प्याकेज सूचिहरू पढिदैछ"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "प्रशासनिक डाइरेक्ट्री %sinfo मा परिवर्तन गर्न असफल भयो"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "प्याकेज नाम प्राप्त गर्दा आन्तरिक त्रुटि"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "फाइल सूचि पढिदैछ"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1804,113 +1815,114 @@ msgstr ""
 "सूचि फाइल '%sinfo/%s' खोल्न असफल भयो । यदि तपाईँ यो फाइल पुन:भण्डारण गर्नु सक्नुहुन्न "
 "भने यसलाई खाली गर्नुहोस् र तुरुन्तै प्याकेजको उही संस्करण पुन-स्थापना गर्नुहोस् !"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "सूचि फाइल %sinfo/%s पढ्न असफल भयो"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "नोड प्राप्त गर्दा आन्तरिक त्रुटि"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "घुमाउरो फाइल %sdiversions खोल्न असफल भयो"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 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
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "आन्तरिक त्रुटिले मोड थपिरहेछ"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "pkg क्यास पहिले सुरुवात हुनुपर्छ"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "प्याकेज फेला पार्न असफल भयो: हेडर, अफसेट %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "वस्तु स्थिति फाइलमा खराब कनफिग फाइल । अफसेट %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "MD5 पद वर्णन गर्दा त्रुटि । अफसेट %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "यो वैध DEB संग्रह होइन, '%s' सदस्य हराइरहेछ"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 apt-inst/deb/debfile.cc:55
 #, fuzzy, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 msgstr "यो वैध DEB संग्रह होइन, यो संग '%s' वा '%s' सदस्य छैन"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "%s मा परिवर्तन गर्न सकिदैन"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "आन्तरीक त्रुटि, सदस्य तोक्न सक्दैन  %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "वैध नियन्त्रण फाइल स्थित गर्नु असफल भयो"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "पद वर्णन गर्न नसकिने नियन्त्रण फाइल"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "%s को लागि पाइप खोल्न सकिएन"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "%s प्रक्रियाबाट त्रुटि पढ्नुहोस् "
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "स्थिर गर्न असफल भयो"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "परिमार्जन समय सेट असफल भयो"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "सिडी रोम डेटाबेस पढ्न असक्षम %s"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1918,56 +1930,56 @@ msgstr ""
 "कृपया APT ले यो सिडी रोमलाई चिन्नको लागि apt-cdrom प्रयोग गर्नुहोस् । apt-get "
 "अद्यावधिक नयाँ सिडी रोमहरू थप्नको लागि प्रयोग गरिदैन"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "गलत सिडी रोम"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "%s मा सिडी रोम अनमाउन्ट गर्न असक्षम भयो, यो अहिले प्रयोगमा हुन सक्छ ।"
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "डिस्क फेला परेन ।"
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "फाइल फेला परेन "
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "अवैध URl, स्थानिय URIS // संग सुरू हुन सक्दैन"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "लगइन भइरहेछ"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "समान नाम निर्धारण गर्न असक्षम भयो"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "स्थानिय नाम निर्धारण गर्न असक्षम भयो"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "सर्भरले जडान अस्वीकार गर्यो र भन्यो: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "प्रयोगकर्ता असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "पास असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -1975,319 +1987,324 @@ msgstr ""
 "प्रोक्सी सर्भर निर्दिष्ट गरियो तर कुनै स्क्रिफ्ट लगइन भएन, Acquire::ftp::ProxyLogin  "
 "खाली छ ।"
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "लगइन स्क्रिफ्ट आदेश '%s' असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "टाइप असफल भयो: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "जडान समय सकियो"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "सर्भरले जडान बन्द गर्यो"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "त्रुटि पढ्नुहोस्"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "एउटा प्रतिक्रियाले बफर अधिप्रवाह गर्यो"
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "प्रोटोकल दूषित"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "त्रुटि लेख्नुहोस्"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "एउटा सकेट सिर्जना गर्न सकेन"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "डेटा सकेट जडान गर्न सकिएन, जडान समय सकियो"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "निस्क्रिय सकेट जडान गर्न सकिएन"
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo सुन्ने सकेट प्राप्त गर्न असक्षम भयो"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "सकेट बाँध्न सकिएन"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "सकेटमा सुन्न सकिएन"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "सकेट नाम निर्धारण गर्न सकिएन"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "पोर्ट आदेश पठाउन असक्षम भयो"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "अज्ञात ठेगाना परिवार %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT असफल भयो, सर्भरले भन्यो: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "डेटा सकेटको जडान समय सकियो"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "जडान स्वीकार गर्न असक्षम भयो"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "समस्या द्रुतान्वेषण फाइल"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "फाइल तान्न असक्षम भयो, सर्भरले भन्यो '%s'"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "डेटा सकेट समय सकियो"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "डेटा स्थान्तरण असफल भयो, सर्भरले भन्यो '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "क्वेरी"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "आह्वान गर्न असक्षम भयो"
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "%s (%s) मा जडान गरिदैछ"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr " %s:%s (%s) मा जडान सुरुवात गर्न सकेन"
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "%s:%s (%s) मा जडान गर्न सकिएन, जडान समय सकियो"
 
-#: methods/connect.cc:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s मा जडान गरिदैछ"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "'%s' हल गर्न सकिएन"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "'%s' हल गर्दा अस्थायी असफल"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट्यो"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "%s %s मा जडान गर्न असफल भयो:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!"
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।"
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "निम्न हस्ताक्षरहरू रूजू हुन सक्दैन किन भने सार्वजनिक कुञ्जी उपलब्ध छैन:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "हेडरहरुको लागि पर्खिदैछ"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr " %u chars माथि एकल हेडर लाइन प्राप्त गर्नुहोस्"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "खराब हेडर लाइन"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP सर्भरले अवैध जवाफ हेडर पठायो"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP सर्भरले अवैध सामग्री-लम्बाई हेडर पठायो"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP सर्भरले अवैध सामग्री-दायरा हेडर पठायो"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "HTTP सर्भर संग भाँचिएको दायरा समर्थन छ"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "अज्ञात मिति ढाँचा"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "असफल चयन गर्नुहोस्"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "जडान समय सकियो"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "फाइलमा त्रुटि लेखिदैछ"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "फाइलमा त्रुटि लेखिदैछ"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "सर्भरबाट त्रुटि पढिदैछ"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "फाइल %s लेख्न असफल भयो"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "खराब हेडर डेटा"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "जडान असफल भयो"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "आन्तरिक त्रुटि"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "एउटा खाली फाइल mmap बनाउन सकिएन"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "%s को लागि पाइप खोल्न सकिएन"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "%lu बाइटहरुको mmap बनाउन सकिएन"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "%s खोल्न असफल"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "आह्वान गर्न असक्षम भयो"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "%lu बाइटहरुको mmap बनाउन सकिएन"
+
+#: apt-pkg/contrib/mmap.cc:311
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "फाइल %s लेख्न असफल भयो"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2316,93 +2333,93 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "चयन %s फेला पार्न सकिएन"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "नचिनिएको टाइप संक्षिप्त रुप: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "कनफिगरेसन फाइल खोलिदैछ %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "वाक्य संरचना त्रुटि %s:%u: बन्द कुनै नाम बिना सुरू हुन्छ ।"
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "वाक्य संरचना त्रुटि %s:%u: वैरुप गरिएको ट्याग"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "वाक्य संरचना त्रुटि %s:%u: मान पछाडि अतिरिक्त जंक"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "वाक्य संरचना त्रुटि %s:%u: निर्देशनहरू माथिल्लो तहबाट मात्र हुन्छ"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "वाक्य संरचना त्रुटि %s:%u: अति धेरै नेस्टेड समावेश गर्दछ"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "वाक्य संरचना त्रुटि %s:%u: यहाँ बाट समावेश गरेको"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "वाक्य संरचना त्रुटि %s:%u: समर्थन नभएको डाइरेक्टिभ '%s'"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr "वाक्य संरचना त्रुटि %s:%u: निर्देशनहरू माथिल्लो तहबाट मात्र हुन्छ"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "वाक्य संरचना त्रुटि %s:%u:फाइलको अन्त्यमा अतिरिक्त जंक"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... त्रुटि!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... गरियो"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "आदेश लाइन विकल्प '%c' [%s बाट] ज्ञात छैन ।"
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "आदेश लाइन विकल्प %s बुझिएन"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "आदेश लाइन विकल्प %s बूलियन छैन"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "विकल्प %s लाई एउटा तर्कको आवश्यकता पर्दछ ।"
@@ -2412,344 +2429,362 @@ msgstr "विकल्प %s लाई एउटा तर्कको आव�
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "विकल्प %s: कनफिगरेसन वस्तु विशिष्टिकरण संग एउटा =<val> हुनुपर्छ ।"
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "विकल्प  %s लाई एउटा इन्टिजर तर्कको आवश्यक पर्दछ, '%s' होइन"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "विकल्प '%s' अति लामो छ"
 
-#: 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 "अर्थ %s बुझिएन, सत्य वा झूठो प्रयास गर्नुहोस् ।"
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "अवैध सञ्चालन  %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "माउन्ट बिन्दु %s स्थिर गर्न असक्षम"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "%s मा परिवर्तन गर्न असक्षम"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "सिडी रोम स्थिर गर्न असफल भयो"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "ताल्चा मारिएको फाइल मात्र पढ्नको लागि ताल्चा मार्न प्रयोग गरिएको छैन %s"
 
-#: apt-pkg/contrib/fileutl.cc:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "ताल्चा मारिएको फाइल खोल्न सकिएन %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "nfs माउन्ट गरिएको लक फाइलको लागि लक प्रयोग गरिएको छैन %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "ताल्चा प्राप्त गर्न सकिएन %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "फाइल %s खोल्न सकिएन"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "%s को लागि पाइप खोल्न सकिएन"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "सहायक प्रक्रिया IPC सिर्जना गर्न असफल"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "सङ्कुचनकर्ता कार्यान्वयन गर्न असफल भयो"
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन"
 
-#: apt-pkg/contrib/fileutl.cc:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन "
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "फाइल बन्द गर्दा समस्या"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "फाइल बन्द गर्दा समस्या"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "फाइल गुप्तिकरण गर्दा समस्या"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "फाइल अनलिङ्क गर्दा समस्या"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "फाइल गुप्तिकरण गर्दा समस्या"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "खाली प्याकेज क्यास"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "प्याकेज क्यास फाइल दूषित भयो "
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "प्याकेज क्यास फाइल एउटा अमिल्दो संस्करण हो"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "प्याकेज क्यास फाइल दूषित भयो "
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "यो APT ले संस्करण प्रणालीलाई समर्थन गर्दैन '%s'"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "प्याकेज क्यास विभिन्न वास्तुकलाको लागि निर्माण भएको हो"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "आधारित"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "पुन:आधारित"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "सुझाव दिन्छ"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "सिफारिस गर्दछ"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "द्वन्दहरू"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "बदल्छ"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "वेकायमहरू"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "महत्वपूर्ण"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "आवश्यक"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "मानक"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "वैकल्पिक"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "अतिरिक्त"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "निर्भरता ट्री निर्माण गरिदैछ"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "उमेद्वार संस्करणहरू"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "निर्भरता सिर्जना"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 #, fuzzy
 msgid "Reading state information"
 msgstr "उपलब्ध सूचना गाँभिदैछ"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "%s खोल्न असफल"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "फाइल %s लेख्न असफल भयो"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (पूर्ण dist)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "%s खोलिदैछ"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।"
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
 
-#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, 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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "फाइल %s खोल्न सकिएन"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2760,25 +2795,18 @@ msgstr ""
 "हटाउनु पर्नेछ । यो प्राय नराम्रो हो, तर यदि तपाईँ यो साँच्चै गर्न चाहनुहुन्छ भने, APT::"
 "Force-LoopBreak विकल्प सक्रिय गर्नुहोस् ।"
 
-#: apt-pkg/packagemanager.cc:501
-#, 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
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "प्याकेज %s पुन:स्थापना हुन चाहन्छ, तर यसको लागि मैले एउटा संग्रह फेला पार्न सकिन ।"
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2786,11 +2814,11 @@ msgstr ""
 "त्रुटि, pkgProblemResolver:: समाधानले विच्छेदन सिर्जना गर्दछ, यो भइरहेको प्याकेजहरुको "
 "कारणले गर्दा हो ।"
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।"
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2799,233 +2827,195 @@ msgstr ""
 "केही अनुक्रमणिका फाइलहरू डाउनलोड गर्न असफल भयो, तिनीहरू उपेक्षित भए, वा सट्टामा पुरानो "
 "एउटा प्रयोग गरियो ।"
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "आंशिक संग्रह डाइरेक्ट्री %s हराइरहेछ ।"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ (%s बाँकी छ)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "विधि ड्राइभर %s फेला पार्न सकिएन ।"
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "विधि %s सही रुपले सुरू हुन सकेन"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । "
 
-#: apt-pkg/init.cc:147
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "प्याकिङ्ग प्रणाली '%s' समर्थित छैन"
 
-#: apt-pkg/init.cc:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "उपयुक्त प्याकिङ्ग प्रणाली प्रकार निर्धारन गर्न असक्षम भयो"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "%s स्थिर गर्न असक्षम भयो ।"
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "तपाईँको स्रोत सूचिमा केही 'source' URIs राख्नुहोस्"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "प्याकेज सूचीहरू वा वस्तुस्थिति फाइल पद वर्णन गर्न वा खोल्न सकिएन ।"
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "यो समस्याहरू सुधार्न तपाईँ apt-get अद्यावधिक चलाउन चाहनुहुन्छ"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।"
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "प्राथमिकता फाइलमा अवैध रेकर्ड, कुनै प्याकेज हेडर छैन"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "पिन टाइप %s बुझ्न सकिएन "
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "पिनको लागि कुनै प्राथमिकता (वा शून्य) निर्दिष्ट छैन"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "क्यास संग एउटा नमिल्दो संस्करण प्रणाली छ"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ प्याकेज)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (प्याकेज १ प्रयोग गर्नुहोस्)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ फाइल संस्करण १)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (प्याकेज २ प्रयोग गर्नुहोस्)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ फाइल संस्करण १)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ संस्करण १)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (प्याकेज ३ प्रयोग गर्नुहोस्)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ फाइल संस्करण १)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (संकलन फाइलले उपलब्ध गर्दछ)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन"
 
-#: apt-pkg/pkgcachegen.cc:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s) ।"
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum मेल भएन"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum मेल भएन"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3033,12 +3023,12 @@ msgid ""
 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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3047,7 +3037,7 @@ msgstr ""
 "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
 "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) "
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3056,47 +3046,47 @@ msgstr ""
 "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
 "निश्चित गर्नुहोस् ।"
 
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।"
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "साइज मेल खाएन"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "द्रष्टब्य, %s को सट्टा  %s चयन भइरहेछ\n"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "बिक्रता ब्ल्क %s ले कुनै औठाछाप समाविष्ट गर्दैन"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3105,64 +3095,64 @@ msgstr ""
 "सिडी रोम माउन्ट विन्दु प्रयोग गरिदैछ %s\n"
 "सिडी रोम माउन्ट गरिदैछ\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "परिचय गराइदैछ.."
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "लेबुल भण्डारण गर्नुहोस्:%s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "सिडी रोम अनमाउन्ट गरिदैछ..."
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "सिडी रोम माउन्ट विन्दु प्रयोग गरिदैछ %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "सिडी रोम अनमाउन्ट गरिदैछ\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "डिस्को लागि पर्खिदै...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "सिडी रोम माउन्ट गरिदै...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "अनुक्रमणिका फाइलहरुको लागि डिस्क स्क्यान गरिदैछ...\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, fuzzy, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr " %i प्याकेज अनुक्रमणिकाहरू, %i स्रोत अनुक्रमणिका र %i  हस्ताक्षरहरू फेला परे\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
 msgstr "लेबुल भण्डारण गर्नुहोस्:%s \n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "त्यो वैध नाम होइन, फेरी प्रयास गर्नुहोस् ।\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3171,293 +3161,368 @@ msgstr ""
 "यो डिस्कको नाम:\n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "प्यकेज सूचिहरू प्रतिलिपी गरिदैछ..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "नयाँ स्रोत सूचि लेखिदैछ\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "यो डिस्कको लागि स्रोत सूचि प्रविष्टिहरू:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i रेकर्डहरू लेखियो ।\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "हराइरहेको फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "हराइरहेको फाइल %i हरू र मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "कनफिगरेसन फाइल खोलिदैछ %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "MD5Sum मेल भएन"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "स्थापना परित्याग गरिदैछ ।"
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr " %s स्थापना भयो"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr " %s कनफिगर गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr " %s हटाइदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr " %s पूर्ण रुपले हट्यो"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "फाइल %s खोल्न सकिएन"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr " %s तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr " %s अनप्याक गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr " %s कनफिगर गर्न तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr " %s स्थापना भयो"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr " %s हटाउन तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr " %s हट्यो"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr " %s पूर्ण रुपले हट्यो"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, 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:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "फाइल %s खोल्न सकिएन"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "जडान असमायिक बन्द भयो"
 
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #१"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #२"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #३"
+
+#~ msgid "decompressor"
+#~ msgstr "सङ्कुचनविहिन कर्ता"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन "
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ प्याकेज)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (प्याकेज १ प्रयोग गर्नुहोस्)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ फाइल संस्करण १)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (प्याकेज २ प्रयोग गर्नुहोस्)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ फाइल संस्करण १)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ संस्करण १)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (प्याकेज ३ प्रयोग गर्नुहोस्)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ फाइल संस्करण १)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (संकलन फाइलले उपलब्ध गर्दछ)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "आन्तरिक त्रुटि, सदस्य तोक्न सकिदैन"
 
diff --git a/po/nl.po b/po/nl.po
index e3bb07d08..38050cd51 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.15.9\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-14 12:59+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -21,187 +21,151 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Pakket %s versie %s heeft een niet-voldane vereiste:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Totaal aantal pakketnamen: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Totaal aantal pakketstructuren: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Normale pakketten: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr " Zuiver virtuele pakketten: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Losstaande virtuele pakketten: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Gemengde virtuele pakketten: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Ontbrekend: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Totaal aantal verschillende versies: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Totaal aantal verschillende beschrijvingen: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Totaal aantal vereisten: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Totaal aantal versie/bestand-relaties: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Totaal aantal Beschrijving/bestand-relaties: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Totaal aantal 'Voorziet'-toewijzingen "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Totaal aantal geglobde strings: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Totale hoeveelheid vereisten-versieruimte: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Totale onbenutte ruimte: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Totale hoeveelheid verantwoorde ruimte: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakketbestand %s is niet meer gesynchroniseerd."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Geen pakketten gevonden"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "U dient precies één zoekpatroon op te geven"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Kan pakket %s niet vinden"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Pakketbestanden:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Vastgepinde pakketten:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(niet gevonden)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Geïnstalleerd: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Kandidaat: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(geen)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Pakketpin: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Versietabel:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3235 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
-#| 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 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"
-#| "   stats - Show some basic statistics\n"
-#| "   dump - Show the entire file in a terse form\n"
-#| "   dumpavail - Print an available file to stdout\n"
-#| "   unmet - Show unmet dependencies\n"
-#| "   search - Search the package list for a regex pattern\n"
-#| "   show - Show a readable record for the package\n"
-#| "   showauto - Display a list of automatically installed packages\n"
-#| "   depends - Show raw dependency information for a package\n"
-#| "   rdepends - Show reverse dependency information for a package\n"
-#| "   pkgnames - List the names of all packages in the system\n"
-#| "   dotty - Generate package graphs for GraphViz\n"
-#| "   xvcg - Generate package graphs for xvcg\n"
-#| "   policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| "  -h   This help text.\n"
-#| "  -p=? The package cache.\n"
-#| "  -s=? The source cache.\n"
-#| "  -q   Disable progress indicator.\n"
-#| "  -i   Show only important deps for the unmet command.\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -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"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -274,30 +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:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 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:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Aankoppelen van '%s' op '%s' is mislukt"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 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."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Argumenten niet in paren"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -326,12 +290,12 @@ msgstr ""
 "  -c=? Lees dit configuratiebestand.\n"
 "  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s is geen geldig DEB-pakket."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -356,40 +320,40 @@ msgstr ""
 "  -c=? Lees dit configuratiebestand.\n"
 "  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1164
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Kan niet naar %s schrijven"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Kan versie van debconf niet bepalen. Is debconf geïnstalleerd?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Pakket-extensielijst is te lang"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Fout bij het verwerken van map %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Bron-extensielijst is te lang"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Fout bij wegschrijven van de koptekst naar het 'contents'-bestand"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Fout bij het verwerken van de inhoud van %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -473,26 +437,26 @@ msgstr ""
 "  -c=?        Lees dit configuratiebestand in\n"
 "  -o=?        Stel een willekeurige configuratie optie in"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Geen van de selecties kwam overeen"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Sommige bestanden zijn niet aanwezig in de pakketbestandsgroep '%s'"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "DB is beschadigd, bestand hernoemd naar %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB is verouderd, opwaardering van %s wordt geprobeerd"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -500,111 +464,111 @@ msgstr ""
 "DB-formaat is ongeldig. Als u opgewaardeerd heeft van een oudere versie van "
 "apt, dient u de database te verwijderen en opnieuw aan te maken."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Kan het DB-bestand %s niet openen: %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "stat op %s is mislukt"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Archief heeft geen 'control'-record"
 
-#: ftparchive/cachedb.cc:452
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Kan geen cursor verkrijgen"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Kon map %s niet lezen\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Kon de status van %s niet opvragen\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "F: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "F: Er zijn fouten van toepassing op het bestand "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Oplossen van %s is mislukt"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Doorlopen boomstructuur is mislukt"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Openen van %s is mislukt"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " OntlLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "readlink op %s is mislukt"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Ontlinken van %s is mislukt"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Linken van %s aan %s is mislukt"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Ontlinklimiet van %sB bereikt.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Archief heeft geen 'package'-veld"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr " %s heeft geen voorrangsingang\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s beheerder is %s, niet %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr " %s heeft geen voorrangsingang voor bronpakketten\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Geheugentoewijzing is mislukt"
 
@@ -614,18 +578,18 @@ msgid "Unable to open %s"
 msgstr "Kan %s niet openen"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Misvormde voorrangsingang %s op regel %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Misvormde voorrangsingang %s op regel %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Misvormde voorrangsingang %s op regel %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -633,63 +597,51 @@ msgstr "Misvormde voorrangsingang %s op regel %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "Lezen van het voorrangsbestand %s is mislukt"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Onbekend compressie-algoritme '%s'"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Gecomprimeerde uitvoer %s vereist een compressieset"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Aanmaken van IPC-pijp naar subproces is mislukt"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Aanmaken van FILE* is mislukt"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Vorken van proces is mislukt"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Comprimeer kind"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Interne fout, aanmaken van %s is mislukt"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Aanmaken subproces-IPC is mislukt"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Uitvoeren van de compressor is mislukt "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "decompressor"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "IO naar subproces/bestand is mislukt"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Lezen tijdens het berekenen van de MD5 is mislukt"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Probleem bij het ontlinken van %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Hernoemen van %s naar %s is mislukt"
@@ -698,75 +650,79 @@ msgstr "Hernoemen van %s naar %s is mislukt"
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex-compilatiefout - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "De volgende pakketten hebben niet-voldane vereisten:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "maar %s is geïnstalleerd"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "maar %s zal geïnstalleerd worden"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "maar het is niet installeerbaar"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "maar het is een virtueel pakket"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "maar het is niet geïnstalleerd"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "maar het zal niet geïnstalleerd worden"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " of"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "De volgende pakketten zullen VERWIJDERD worden:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "De volgende pakketten zijn achtergehouden:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "De volgende pakketten zullen opgewaardeerd worden:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (vanwege %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -774,59 +730,59 @@ msgstr ""
 "WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n"
 "Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu opnieuw geïnstalleerd, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu gedegradeerd, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Let op, '%s' wordt geselecteerd omwille van de taak '%s'\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Let op, '%s' wordt geselecteerd omwille van de regex '%s'\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Pakket %s is een virtueel pakket voorzien door:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Geïnstalleerd]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr "[Niet de kandidaat-versie]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "U dient er één expliciet te selecteren voor installatie."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -837,133 +793,132 @@ msgstr ""
 "een ander pakket. Mogelijk betekent dit dat het pakket ontbreekt,\n"
 "verouderd is, of enkel beschikbaar is van een andere bron\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Echter, de volgende pakketten vervangen dit:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Pakket '%s' heeft geen kandidaat voor installatie"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "Virtuele pakketten zoals '%s' kunnen niet worden verwijderd\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Let op, '%s' wordt geselecteerd in plaats van '%s'\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet "
 "gevraagd.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "%s wordt overgeslagen, het is niet geïnstalleerd en alleen opwaardering is "
 "gevraagd.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "Herinstallatie van %s is niet mogelijk daar het niet opgehaald kan worden.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s is reeds de nieuwste versie.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2096 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s is ingesteld voor handmatige installatie.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
-#| msgid "Selected version '%s' (%s) for '%s'\n"
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n"
 
-#: cmdline/apt-get.cc:969
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Vereisten worden gecorrigeerd..."
 
-#: cmdline/apt-get.cc:972
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " mislukt."
 
-#: cmdline/apt-get.cc:975
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Kan vereisten niet corrigeren"
 
-#: cmdline/apt-get.cc:978
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Klaar"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen."
 
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken."
 
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 "WAARSCHUWING: De volgende pakketten kunnen niet geauthentificeerd worden:"
 
-#: cmdline/apt-get.cc:1016
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Authentificatiewaarschuwing is genegeerd.\n"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Wilt u deze pakketten installeren zonder verificatie [j/N]? "
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Sommige pakketten konden niet geauthentificeerd worden"
 
-#: cmdline/apt-get.cc:1034 cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes"
 
-#: cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Interne fout, InstallPackages is aangeroepen met defecte pakketten!"
 
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Interne fout, rangschikken is niet voltooid"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Merkwaardig... De groottes kwamen niet overeen, gelieve apt@packages.debian."
@@ -971,52 +926,52 @@ 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:1140
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\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:1145
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Er moeten %sB aan archieven opgehaald worden.\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:1152
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Door deze operatie zal er %sB extra schijfruimte gebruikt worden.\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:1157
+#: cmdline/apt-get.cc:1173
 #, c-format
 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:1172 cmdline/apt-get.cc:1175 cmdline/apt-get.cc:2514
-#: cmdline/apt-get.cc:2517
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"
 
-#: cmdline/apt-get.cc:1185
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "U heeft onvoldoende vrije schijfruimte op %s."
 
-#: cmdline/apt-get.cc:1201 cmdline/apt-get.cc:1221
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking."
 
-#: cmdline/apt-get.cc:1203
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Ja, doe wat ik zeg!"
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1027,28 +982,28 @@ msgstr ""
 "Als u wilt doorgaan, dient u de zin '%s' in te typen.\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1211 cmdline/apt-get.cc:1230
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Afbreken."
 
-#: cmdline/apt-get.cc:1226
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Wilt u doorgaan [J/n]? "
 
-#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:2579 apt-pkg/algorithms.cc:1445
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ophalen van %s is mislukt  %s\n"
 
-#: cmdline/apt-get.cc:1316
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Ophalen van sommige bestanden is mislukt"
 
-#: cmdline/apt-get.cc:1317 cmdline/apt-get.cc:2591
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
 
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1056,19 +1011,19 @@ msgstr ""
 "Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --"
 "fix-missing proberen?"
 
-#: cmdline/apt-get.cc:1327
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund"
 
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Geen oplossing voor de missende pakketten gevonden."
 
-#: cmdline/apt-get.cc:1333
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Installatie wordt afgebroken."
 
-#: cmdline/apt-get.cc:1361
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1082,35 +1037,35 @@ msgstr[1] ""
 "De volgende pakketten zijn van uw systeem verdwenen omdat\n"
 "alle bestanden zijn overschreven door andere pakketten:"
 
-#: cmdline/apt-get.cc:1365
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Let op: Dit wordt automatische en bewust door dpkg gedaan."
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Negeer niet beschikbare doelrelease '%s' van pakket '%s'"
 
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "'%s' wordt genomen als bronpakket in plaats van '%s'\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1573
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Negeer niet beschikbare versie '%s' van pakket '%s'"
 
-#: cmdline/apt-get.cc:1589
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "De opdracht 'update' aanvaard geen argumenten"
 
-#: cmdline/apt-get.cc:1652
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten"
 
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1128,15 +1083,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1759 cmdline/apt-get.cc:1929
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "De volgende informatie helpt u mogelijk verder:"
 
-#: cmdline/apt-get.cc:1763
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Interne fout, AutoRemover heeft dingen stukgemaakt"
 
-#: cmdline/apt-get.cc:1770
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1148,7 +1103,7 @@ msgstr[1] ""
 "De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer "
 "nodig:"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1157,21 +1112,21 @@ msgstr[0] "%lu pakket is automatisch geïnstalleerd en is niet langer nodig.\n"
 msgstr[1] ""
 "%lu pakketten zijn automatisch geïnstalleerd en zijn niet langer nodig.\n"
 
-#: cmdline/apt-get.cc:1776
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "U kunt deze verwijderen via 'apt-get autoremove'."
 
-#: cmdline/apt-get.cc:1795
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
 
-#: cmdline/apt-get.cc:1894
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te "
 "lossen:"
 
-#: cmdline/apt-get.cc:1898
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1179,7 +1134,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:1914
+#: cmdline/apt-get.cc:1929
 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"
@@ -1190,75 +1145,75 @@ 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:1932
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Niet-werkende pakketten:"
 
-#: cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "De volgende extra pakketten zullen geïnstalleerd worden:"
 
-#: cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Voorgestelde pakketten:"
 
-#: cmdline/apt-get.cc:2049
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Aanbevolen pakketten:"
 
-#: cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kon pakket %s niet vinden"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s is ingesteld op automatische geïnstalleerd.\n"
 
-#: cmdline/apt-get.cc:2106 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Opwaardering wordt doorgerekend... "
 
-#: cmdline/apt-get.cc:2125 methods/ftp.cc:708 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Mislukt"
 
-#: cmdline/apt-get.cc:2130
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Klaar"
 
-#: cmdline/apt-get.cc:2197 cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
 
-#: cmdline/apt-get.cc:2233 cmdline/apt-get.cc:2269
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Kon de ophaalmap niet vergrendelen"
 
-#: cmdline/apt-get.cc:2320
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2376
+#: cmdline/apt-get.cc:2396
 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:2416 cmdline/apt-get.cc:2728
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kan geen bronpakket vinden voor %s"
 
-#: cmdline/apt-get.cc:2433
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1268,7 +1223,7 @@ msgstr ""
 "'%s' op:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2438
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1280,91 +1235,88 @@ msgstr ""
 "om de nieuwste (mogelijk nog niet uit uitgebrachte) versie van het pakket op "
 "te halen.\n"
 
-#: cmdline/apt-get.cc:2491
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2548
 #, 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:2537
+#: cmdline/apt-get.cc:2557
 #, 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:2542
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Moet %sB aan bronarchieven ophalen.\n"
 
-#: cmdline/apt-get.cc:2548
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Ophalen bron %s\n"
 
-#: cmdline/apt-get.cc:2586
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Ophalen van sommige archieven is mislukt."
 
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2637
 #, 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:2629
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Uitpakopdracht '%s' is mislukt.\n"
 
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2650
 #, 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:2652
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Bouwopdracht '%s' is mislukt.\n"
 
-#: cmdline/apt-get.cc:2672
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Dochterproces is mislukt"
 
-#: cmdline/apt-get.cc:2691
+#: cmdline/apt-get.cc:2711
 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:2716
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2733
+#: cmdline/apt-get.cc:2753
 #, 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:2753
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s heeft geen bouwvereisten.\n"
 
-#: cmdline/apt-get.cc:2883
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
-#| msgid ""
-#| "%s dependency for %s cannot be satisfied because the package %s cannot be "
-#| "found"
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
@@ -1372,7 +1324,7 @@ msgstr ""
 "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
 "onvindbaar is"
 
-#: cmdline/apt-get.cc:2904
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1381,18 +1333,15 @@ msgstr ""
 "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
 "onvindbaar is"
 
-#: cmdline/apt-get.cc:2927
+#: cmdline/apt-get.cc:2947
 #, 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:2966
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
-#| msgid ""
-#| "%s dependency for %s cannot be satisfied because no available versions of "
-#| "package %s can satisfy version requirements"
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
@@ -1400,11 +1349,8 @@ 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:2972
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
-#| msgid ""
-#| "%s dependency for %s cannot be satisfied because the package %s cannot be "
-#| "found"
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
@@ -1412,75 +1358,31 @@ msgstr ""
 "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
 "onvindbaar is"
 
-#: cmdline/apt-get.cc:2995
+#: cmdline/apt-get.cc:3015
 #, 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:3011
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Bouwvereisten voor %s konden niet voldaan worden."
 
-#: cmdline/apt-get.cc:3016
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Verwerken van de bouwvereisten is mislukt"
 
-#: cmdline/apt-get.cc:3109 cmdline/apt-get.cc:3121
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
-#| msgid "Connecting to %s (%s)"
 msgid "Changelog for %s (%s)"
 msgstr "Er wordt verbinding gemaakt met %s (%s)"
 
-#: cmdline/apt-get.cc:3240
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Ondersteunde modules:"
 
-#: cmdline/apt-get.cc:3281
+#: cmdline/apt-get.cc:3301
 #, fuzzy
-#| msgid ""
-#| "Usage: apt-get [options] command\n"
-#| "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
-#| "       apt-get [options] source pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-get is a simple command line interface for downloading and\n"
-#| "installing packages. The most frequently used commands are update\n"
-#| "and install.\n"
-#| "\n"
-#| "Commands:\n"
-#| "   update - Retrieve new lists of packages\n"
-#| "   upgrade - Perform an upgrade\n"
-#| "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-#| "   remove - Remove packages\n"
-#| "   autoremove - Remove automatically all unused packages\n"
-#| "   purge - Remove packages and config files\n"
-#| "   source - Download source archives\n"
-#| "   build-dep - Configure build-dependencies for source packages\n"
-#| "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-#| "   dselect-upgrade - Follow dselect selections\n"
-#| "   clean - Erase downloaded archive files\n"
-#| "   autoclean - Erase old downloaded archive files\n"
-#| "   check - Verify that there are no broken dependencies\n"
-#| "   markauto - Mark the given packages as automatically installed\n"
-#| "   unmarkauto - 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"
-#| "  -d  Download only - do NOT install or unpack archives\n"
-#| "  -s  No-act. Perform ordering simulation\n"
-#| "  -y  Assume Yes to all queries and do not prompt\n"
-#| "  -f  Attempt to correct a system with broken dependencies in place\n"
-#| "  -m  Attempt to continue if archives are unlocatable\n"
-#| "  -u  Show a list of upgraded packages as well\n"
-#| "  -b  Build the source package after fetching it\n"
-#| "  -V  Show verbose version numbers\n"
-#| "  -c=? Read this configuration file\n"
-#| "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
-#| "pages for more information and options.\n"
-#| "                       This APT has Super Cow Powers.\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1568,7 +1470,7 @@ msgstr ""
 "voor meer informatie en opties.\n"
 "                       Deze APT heeft Super Koe kracht.\n"
 
-#: cmdline/apt-get.cc:3444
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1580,33 +1482,33 @@ msgstr ""
 "    Houd er ook rekening mee ook dat vergrendeling is uitgeschakeld en\n"
 "    vertrouw dus niet op de relevantie voor de werkelijke huidige situatie!"
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Geraakt "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Ophalen:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Genegeerd "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Fout "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%sB opgehaald in %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Bezig]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1617,53 +1519,62 @@ msgstr ""
 " '%s'\n"
 "in het station '%s' te plaatsen en op 'enter' te drukken\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
-#| msgid "but it is not installed"
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "maar het is niet geïnstalleerd"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
-#| msgid "%s set to manually installed.\n"
 msgid "%s was already set to manually installed.\n"
 msgstr "%s is ingesteld voor handmatige installatie.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
-#| msgid "%s set to automatically installed.\n"
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s is ingesteld op automatische geïnstalleerd.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
-#| msgid "%s is already the newest version.\n"
 msgid "%s was already set on hold.\n"
 msgstr "%s is reeds de nieuwste versie.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
-#| msgid "%s is already the newest version.\n"
 msgid "%s was already not hold.\n"
 msgstr "%s is reeds de nieuwste versie.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
-#| msgid "%s set to manually installed.\n"
 msgid "%s set on hold.\n"
 msgstr "%s is ingesteld voor handmatige installatie.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
-#| msgid "Failed to open %s"
 msgid "Canceled hold on %s.\n"
 msgstr "Openen van %s is mislukt"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1685,11 +1596,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Onbekend pakketrecord!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1754,197 +1665,199 @@ msgstr ""
 msgid "Merging available information"
 msgstr "De beschikbare informatie wordt samengevoegd"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Aanmaken pijp is mislukt"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Uitvoeren van gzip is mislukt "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Beschadigd archief"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar controlesom klopt niet, het pakket is beschadigd"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Onbekende TAR-kopteksttype %u, onderdeel %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Ongeldige archiefondertekening"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Fout bij het lezen van de koptekst van het archiefonderdeel"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "Ongeldige koptekst voor archiefonderdeel: %s"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Ongeldige koptekst in archiefonderdeel"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Archief is te kort"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Lezen van de archiefkopteksten is mislukt"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "DropNode werd aangeroepen op een nog gelinkte knoop"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Lokaliseren van het hash-element is mislukt!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Toewijzen van de omleiding is mislukt"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Interne fout in AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Er wordt gepoogd om de omleiding %s->%s en %s/%s te overschrijven"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Dubbele toevoeging van de omleiding %s->%s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Dubbel configuratiebestand %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Wegschrijven van bestand %s is mislukt"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Sluiten van bestand %s is mislukt"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Het pad %s is te lang"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s wordt meer dan eens uitgepakt"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "De map %s is al omgeleid"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Het omleidingspad is te lang"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "Vinden van de knoop in de hash-emmer is mislukt"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Het pad is te lang"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, 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:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:454 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:353
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kan %s niet lezen"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Kan de status van %s niet opvragen"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Verwijderen van %s is mislukt"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Kan %s niet aanmaken"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Opvragen van de status van %sinfo is mislukt"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "De 'info'- en de 'temp'-mappen dienen op hetzelfde bestandsysteem te staan"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1063
-#: apt-pkg/pkgcachegen.cc:1167 apt-pkg/pkgcachegen.cc:1173
-#: apt-pkg/pkgcachegen.cc:1335
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Pakketlijsten worden ingelezen"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Verspringen naar de beheermap %sinfo is mislukt"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Interne fout bij het ophalen van de pakketnaam"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Bestandslijst worden ingelezen"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1955,114 +1868,115 @@ msgstr ""
 "kunt herstellen, dient u het leeg te maken en daarna onmiddellijk dezelfde "
 "versie van het pakket te installeren!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Lezen van lijstbestand %sinfo/%s is mislukt"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Interne fout bij het verkrijgen van een knoop"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Openen van het omleidingsbestand %sdiversions is mislukt"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "Het pakketcachebestand is beschadigd"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Ongeldige regel in het omleidingsbestand: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Interne fout bij het toevoegen van een omleiding"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "De pakketcache dient eerst geïnitialiseerd te zijn"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Vinden van een 'Package:'-koptekst is mislukt, regel %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Foute 'ConfFile'-sectie in het statusbestand. Regel %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Fout bij het parsen van de MD5. regel %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Dit is geen geldig DEB-archief, het onderdeel '%s' mankeert"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 "Dit is geen geldig DEB-archief, het bevat geen  '%s', '%s', of '%s' onderdeel"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Kon niet wijzigen naar %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Interne fout, kon onderdeel %s niet vinden"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Lokaliseren van een geldig 'control'-bestand is mislukt"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Niet-ontleedbaar 'control'-bestand"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Kon geen pijp openen voor %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Leesfout door proces %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:527
-#: methods/rred.cc:536
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "stat is mislukt"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:533
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Instellen van de aanpassingstijd is mislukt"
 
-#: methods/cdrom.cc:200
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Kan de cd databank %s niet lezen"
 
-#: methods/cdrom.cc:209
+#: 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"
@@ -2070,57 +1984,57 @@ msgstr ""
 "Om deze APT deze CD te laten herkennen kunt u best apt-cdrom gebruiken. 'apt-"
 "get update' is niet in staat om nieuwe CDs toe te voegen"
 
-#: methods/cdrom.cc:219
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "Verkeerde CD"
 
-#: methods/cdrom.cc:246
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 "Kan de CD in %s niet loskoppelen, mogelijk wordt die nog steeds gebruikt."
 
-#: methods/cdrom.cc:251
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Schijf niet gevonden"
 
-#: methods/cdrom.cc:259 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Bestand niet gevonden"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Ongeldige URI, lokale URIs mogen niet beginnen met //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:169
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Bezig met aanmelden"
 
-#: methods/ftp.cc:175
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Kan de 'peer'-naam niet bepalen"
 
-#: methods/ftp.cc:180
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Kan de lokale naam niet bepalen"
 
-#: methods/ftp.cc:211 methods/ftp.cc:239
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Onze verbinding is door de server geweigerd met bericht: %s"
 
-#: methods/ftp.cc:217
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER mislukt; bericht van server: %s"
 
-#: methods/ftp.cc:224
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS mislukt; bericht van server: %s"
 
-#: methods/ftp.cc:244
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2128,200 +2042,200 @@ msgstr ""
 "Er was een proxy-server opgegeven, maar geen aanmeldscript, Acquire::ftp::"
 "ProxyLogin is leeg."
 
-#: methods/ftp.cc:272
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Aanmeldscriptopdracht '%s' is mislukt; bericht van server: %s"
 
-#: methods/ftp.cc:298
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE mislukt; bericht van server: %s"
 
-#: methods/ftp.cc:336 methods/ftp.cc:447 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Verbinding is verlopen"
 
-#: methods/ftp.cc:342
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Verbinding is verbroken door de server"
 
-#: methods/ftp.cc:345 apt-pkg/contrib/fileutl.cc:831 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Leesfout"
 
-#: methods/ftp.cc:352 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Een reactie deed de buffer overlopen"
 
-#: methods/ftp.cc:369 methods/ftp.cc:381
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Protocolcorruptie"
 
-#: methods/ftp.cc:453 apt-pkg/contrib/fileutl.cc:873 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Schrijffout"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Kon geen socket aanmaken"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "Kon de datasocket niet verbinden, de verbinding verliep"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Kon de passieve socket niet verbinden."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo kon geen luistersocket verkrijgen"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Kon geen socket binden"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Kon niet op de socket niet luisteren"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Kon de socketnaam niet bepalen"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Kan PORT-commando niet verzenden"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Onbekende adresfamilie %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT is mislukt; bericht van server: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Datasocket verbinding is verlopen"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Kan de verbinding niet aanvaarden"
 
-#: methods/ftp.cc:870 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Probleem bij het hashen van het bestand"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Kan bestand niet ophalen; bericht van server: %s"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Datasocket verliep"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Data transfer is mislukt, server zei: %s"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Zoekopdracht"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Aanroepen mislukt van "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Er wordt verbinding gemaakt met %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Kan de verbinding met %s:%s (%s) niet aangaan."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Er wordt verbinding gemaakt met %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Kon '%s' niet vinden"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Tijdelijke fout bij het opzoeken van '%s'"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, 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:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Kan geen verbinding maken met %s %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Er is tenminste één ongeldige ondertekening gevonden."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Onbekende fout bij het uitvoeren van gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "De volgende ondertekeningen waren ongeldig:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2329,109 +2243,114 @@ msgstr ""
 "De volgende ondertekeningen konden niet geverifieerd worden omdat de "
 "publieke sleutel niet beschikbaar is:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Wachtend op de kopteksten"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Foute koptekstregel"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 "Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 "Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Onbekend datumformaat"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Selectie is mislukt"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Verbinding verliep"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Fout bij het schrijven naar het uitvoerbestand"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Fout bij het schrijven naar bestand"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Fout bij het schrijven naar het bestand"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 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:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Fout bij het lezen van de server"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Afkorten van bestand is mislukt"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Foute koptekstdata"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Interne fout"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Kan een leeg bestand niet mmappen"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Kon de bestandsindicator %i niet dupliceren"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Kon van %lu bytes geen mmap maken"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "Kan mmap niet sluiten"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "Kan mmap niet synchronizeren"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Kon van %lu bytes geen mmap maken"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Afkorten van bestand is mislukt"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2440,7 +2359,7 @@ msgstr ""
 "Onvoldoende ruimte voor Dynamische MMap. Gelieve de grootte van APT::Cache-"
 "Limit te verhogen. Huidige waarde: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2449,7 +2368,7 @@ msgstr ""
 "Kan het formaat van de MMap niet vergroten omdat de grens van %lu bytes al "
 "is bereikt"
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2480,441 +2399,454 @@ msgstr "%limin %lis"
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1137
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selectie %s niet gevonden"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Onbekende type-afkorting '%c'"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Configuratiebestand %s wordt geopend"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaxfout %s:%u: Blok start zonder naam."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntaxfout %s:%u: Verkeerd gevormde markering"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntaxfout %s:%u: Extra rommel na waarde"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Syntaxfout %s:%u: Richtlijnen kunnen enkel op het hoogste niveau gegeven "
 "worden"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntaxfout %s:%u: Teveel geneste invoegingen"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntaxfout %s:%u: Vanaf hier ingevoegd"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaxfout %s:%u: Niet-ondersteunde richtlijn '%s'"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Syntaxfout %s:%u: De richtlijn 'clear' vereist een optieboom als argument"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntaxfout %s:%u: Extra rommel aan het einde van het bestand"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Fout!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Klaar"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Commandoregel-optie '%c' [van %s] is onbekend."
 
-#: apt-pkg/contrib/cmndline.cc:101 apt-pkg/contrib/cmndline.cc:109
-#: apt-pkg/contrib/cmndline.cc:117
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Commandoregel-optie %s wordt niet begrepen"
 
-#: apt-pkg/contrib/cmndline.cc:122
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Commandoregel-optie %s is niet booleaans"
 
-#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Optie %s vereist een argument."
 
-#: apt-pkg/contrib/cmndline.cc:197 apt-pkg/contrib/cmndline.cc:203
+#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 "Optie %s: De specificatie van het configuratie-item dient een =<waarde> te "
 "bevatten."
 
-#: apt-pkg/contrib/cmndline.cc:232
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Optie %s vereist een integer getal als argument, niet '%s'"
 
-#: apt-pkg/contrib/cmndline.cc:263
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Optie '%s' is te lang"
 
-#: apt-pkg/contrib/cmndline.cc:295
+#: apt-pkg/contrib/cmndline.cc:298
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr "Waarde %s wordt niet begrepen, probeer 'true' of 'false'."
 
-#: apt-pkg/contrib/cmndline.cc:345
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Ongeldige operatie %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Kan de status van het aanhechtpunt %s niet opvragen"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:460 apt-pkg/acquire.cc:485 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Kan %s niet veranderen"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "stat op de CD-ROM is mislukt"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Kon het vergrendelingsbestand '%s' niet openen"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Kon vergrendeling %s niet verkrijgen"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:690
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Er is gewacht op %s, maar die kwam niet"
 
-#: apt-pkg/contrib/fileutl.cc:702
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Subproces %s ontving een segmentatiefout."
 
-#: apt-pkg/contrib/fileutl.cc:704
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Subproces %s ontving signaal %u."
 
-#: apt-pkg/contrib/fileutl.cc:708
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Subproces %s gaf de foutcode %u terug"
 
-#: apt-pkg/contrib/fileutl.cc:710
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Subproces %s sloot onverwacht af"
 
-#: apt-pkg/contrib/fileutl.cc:775 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Kon het bestand %s niet openen"
 
-#: apt-pkg/contrib/fileutl.cc:792
+#: apt-pkg/contrib/fileutl.cc:923
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Kon de bestandsindicator %d niet openen"
 
-#: apt-pkg/contrib/fileutl.cc:852
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Aanmaken subproces-IPC is mislukt"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Uitvoeren van de compressor is mislukt "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, 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:885
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, 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:1021
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Probleem bij het afsluiten van het gzip-bestand %s"
 
-#: apt-pkg/contrib/fileutl.cc:1024
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Probleem bij het afsluiten van het bestand %s"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1419
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Probleem bij het hernoemen van '%s' naar '%s'"
 
-#: apt-pkg/contrib/fileutl.cc:1040
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Probleem bij het ontlinken van het bestand %s"
 
-#: apt-pkg/contrib/fileutl.cc:1053
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Probleem bij het synchroniseren van het bestand"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Lege pakketcache"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Het pakketcachebestand is beschadigd"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "Het pakketcachebestand heeft een niet-compatibele versie"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Het pakketcachebestand is beschadigd"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Deze APT ondersteunt het versienummeringssysteem '%s' niet"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "De pakketcache was aangemaakt voor een andere architectuur"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Vereisten"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Voor-Vereisten"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Suggesties"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Aanbevelingen"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Conflicteert met"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Vervangt"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Verouderd"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Breekt"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "Vult aan"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "belangrijk"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "noodzakelijk"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "standaard"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "optioneel"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Boom van vereisten wordt opgebouwd"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Kandidaat-versies"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Generatie vereisten"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "De status informatie wordt gelezen"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Openen van StateFile %s is mislukt"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Kon pakketbestand %s niet ontleden (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Kon pakketbestand %s niet ontleden (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "Misvormde regel %lu in bronlijst %s ([optie] onbegrijpelijk)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Misvormde regel %lu in bronlijst %s ([optie] te kort)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Misvormde regel %lu in bronlijst %s ([%s] is geen toekenning)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Misvormde regel %lu in bronlijst %s ([%s] heeft geen sleutel)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 "Misvormde regel %lu in bronlijst %s ([%s] sleutel %s heeft geen waarde)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Misvormde regel %lu in bronlijst %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Misvormde regel %lu in bronlijst %s (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Misvormde regel %lu in bronlijst %s (URI parse)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Misvormde regel %lu in bronlijst %s (dist parse)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "%s wordt geopend"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Regel %u van de bronlijst %s is te lang."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Misvormde regel %u in bronlijst %s (type)"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:645
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2923,7 +2855,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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Kon het bestand '%s' niet openen"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2935,21 +2872,12 @@ msgstr ""
 "vaak slecht, wilt u dit echt doen dan dient u de APT::Force-LoopBreak optie "
 "te activeren."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"Kon onmiddelijke configuratie van reeds uitgepakte '%s' niet uitvoeren. Voor "
-"details zie 'man 5 apt.conf', onder APT::Immediate-Configure."
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Indexbestand van type '%s' wordt niet ondersteund"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2957,7 +2885,7 @@ msgstr ""
 "Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor "
 "gevonden worden."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2965,15 +2893,12 @@ msgstr ""
 "Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan "
 "veroorzaakt worden door vastgehouden pakketten."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast."
 
-#: apt-pkg/algorithms.cc:1471 apt-pkg/algorithms.cc:1473
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
-#| msgid ""
-#| "Some index files failed to download, they have been ignored, or old ones "
-#| "used instead."
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2981,245 +2906,206 @@ msgstr ""
 "Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er "
 "zijn oudere versies van gebruikt."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Lijstmap %spartial is afwezig."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Archiefmap %spartial is afwezig."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "Kan de map %s niet vergrendelen"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:861
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Bestand %li van %li wordt opgehaald (nog %s te gaan)"
 
-#: apt-pkg/acquire.cc:863
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Bestand %li van %li wordt opgehaald"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Methode %s startte niet op de juiste manier"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:146
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Kan geen geschikt pakketsysteemtype bepalen"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Kan de status van %s niet opvragen."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 "Uw bronnenlijst (/etc/apt/sources.list) dient tenminste één bron-URI te "
 "bevatten"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "De pakketlijsten of het statusbestand konden of niet ontleed, of niet "
 "geopend worden."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "U kunt misschien 'apt-get update' uitvoeren om deze problemen te verhelpen"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "De lijst van bronnen kon niet gelezen worden."
 
-#: apt-pkg/policy.cc:72
+#: apt-pkg/policy.cc:74
 #, 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:390
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "Ongeldige record in het voorkeurenbestand %s, 'Package' koptekst ontbreekt"
 
-#: apt-pkg/policy.cc:412
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Pintype %s wordt niet begrepen"
 
-#: apt-pkg/policy.cc:420
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Cache heeft een niet-compatibel versienummeringssysteem"
 
-#: apt-pkg/pkgcachegen.cc:190
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Fout tijdens verwerken van %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:207
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Fout tijdens verwerken van %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:245
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Fout tijdens verwerken van %s (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:277
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Fout tijdens verwerken van %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:281
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Fout tijdens verwerken van %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:298 apt-pkg/pkgcachegen.cc:308
-#: apt-pkg/pkgcachegen.cc:316
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Fout tijdens verwerken van %s (NewVersion%d)"
-
-#: apt-pkg/pkgcachegen.cc:312
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Fout tijdens verwerken van %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:345
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Fout tijdens verwerken van %s (NewFileDesc2)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Fout tijdens verwerken van %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Wauw, u heeft meer pakketten dan deze APT aan kan."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Wauw, u heeft meer versies dan deze APT aan kan."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Wauw, u heeft het maximum aantal beschrijvingen dat deze APT aan kan "
 "overschreden."
 
-#: apt-pkg/pkgcachegen.cc:360
+#: apt-pkg/pkgcachegen.cc:243
 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:389
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Fout tijdens verwerken van %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:403
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Fout tijdens verwerken van %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:975
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Kon de status van de bronpakketlijst %s niet opvragen"
 
-#: apt-pkg/pkgcachegen.cc:1080
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Voorziene bestanden worden verzameld"
 
-#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1281
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "herbenoeming is mislukt, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "MD5-som komt niet overeen"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1847
-#: apt-pkg/acquire-item.cc:1990
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Hash-som komt niet overeen"
 
-#: apt-pkg/acquire-item.cc:1387
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, fuzzy, c-format
-#| msgid "Unable to parse Release file %s"
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Kon Release-bestand %s niet ontleden"
 
-#: apt-pkg/acquire-item.cc:1438
+#: apt-pkg/acquire-item.cc:1450
 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:1476
+#: apt-pkg/acquire-item.cc:1488
 #, 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:1498
+#: apt-pkg/acquire-item.cc:1510
 #, 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:1531
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3230,12 +3116,12 @@ msgstr ""
 "%s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1541 apt-pkg/acquire-item.cc:1546
+#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-fout: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1638
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3244,11 +3130,8 @@ 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:1697
+#: apt-pkg/acquire-item.cc:1709
 #, fuzzy, c-format
-#| msgid ""
-#| "I wasn't able to locate file for the %s package. This might mean you need "
-#| "to manually fix this package."
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package."
@@ -3256,7 +3139,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:1752
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3264,41 +3147,41 @@ msgstr ""
 "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
 "pakket %s."
 
-#: apt-pkg/acquire-item.cc:1839
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Grootte komt niet overeen"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Kon Release-bestand %s niet ontleden"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Geen secties in Release-bestand %s"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Geen Hash-vermelding in Release-bestand %s"
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Geen 'Valid-Until'-vermelding in Release-bestand %s"
 
-#: apt-pkg/indexrecords.cc:129
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Geen 'Date'-vermelding in Release-bestand %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Verkopersblok %s bevat geen vingerafdruk"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3307,41 +3190,41 @@ msgstr ""
 "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n"
 "CD wordt aangekoppeld\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Identificatie..."
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Opgeslagen label: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "CD wordt afgekoppeld...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "CD wordt losgekoppeld\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Er wordt gewacht op de schijf...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "CD wordt aangekoppeld...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Er wordt gescand voor indexbestanden...\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3350,7 +3233,7 @@ msgstr ""
 "Er zijn %zu pakket-indexen, %zu bron-indexen, %zu vertalingsindexen, en %zu "
 "handtekeningen gevonden\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3358,16 +3241,16 @@ msgstr ""
 "Kan geen Package-bestanden vinden. Is dit mogelijk geen Debian schijf, of de "
 "verkeerde architectuur?"
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Label '%s' gevonden\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Dat is een ongeldige naam, gelieve opnieuw te proberen.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3376,94 +3259,93 @@ msgstr ""
 "De schijf heet:\n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Pakketlijsten worden gekopieerd..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Nieuwe bronlijst wordt weggeschreven\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "Bronlijst-ingangen voor de schijf zijn:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:927
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "%i records weggeschreven.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:929
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "%i records weggeschreven met %i missende bestanden.\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:935
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "%i records weggeschreven met %i missende bestanden en %i niet overeenkomende "
 "bestanden\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Niet-bestaand bestand %s wordt overgeslagen"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Kan geen authenticatierecord vinden voor: %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash-som komt niet overeen voor: %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "Geen sleutelring geïnstalleerd in %s."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release '%s' voor '%s' is niet gevonden"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versie '%s' voor '%s' is niet gevonden"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Kon taak '%s' niet vinden"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Kon geen enkel pakket vinden bij regex '%s'"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, fuzzy, c-format
-#| msgid "Can't select versions from package '%s' as it purely virtual"
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Kan geen versies selecteren voor pakket '%s' omdat deze zuiver virtueel is"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3472,130 +3354,154 @@ msgstr ""
 "Kan noch de geïnstalleerde, noch de kandidaat-versie van het pakket '%s' "
 "selecteren omdat deze geen van beide heeft"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Kan de nieuwste versie van het pakket '%s' niet selecteren omdat deze zuiver "
 "virtueel is"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Kan de kandidaat-versie van het pakket %s niet selecteren omdat deze geen "
 "kandidaat heeft"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Kan de geïnstalleerde versie van het pakket %s niet selecteren omdat deze "
 "niet geïnstalleerd is"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "%s wordt geïnstalleerd"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "%s wordt geconfigureerd"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "%s wordt verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s wordt volledig verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "De verdwijning van %s wordt opgemerkt"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Map '%s' ontbreekt"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Kon het bestand '%s' niet openen"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "%s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "%s wordt uitgepakt"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Configuratie van %s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "%s is geïnstalleerd"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Verwijdering van %s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "%s is verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Volledige verwijdering van %s wordt voorbereid"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s is volledig verwijderd"
 
-#: apt-pkg/deb/dpkgpm.cc:1087
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1118
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "dpkg wordt uitgevoerd"
 
-#: apt-pkg/deb/dpkgpm.cc:1344
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1349
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemen met vereisten - wordt niet geconfigureerd"
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3603,7 +3509,7 @@ msgstr ""
 "Er is geen apport-verslag weggeschreven omdat de foutmelding volgt op een "
 "eerdere mislukking."
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3611,7 +3517,7 @@ msgstr ""
 "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
 "over een volle schijf."
 
-#: apt-pkg/deb/dpkgpm.cc:1363
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3619,14 +3525,14 @@ msgstr ""
 "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
 "over onvoldoende-geheugen."
 
-#: apt-pkg/deb/dpkgpm.cc:1370
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Er is geen apport-verslag weggeschreven omdat de foutmelding een fout over "
 "dpkg-I/O is."
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3635,45 +3541,44 @@ msgstr ""
 "Kan de beheersmap (%s) niet vergrendelen. Is deze in gebruik door een ander "
 "proces?"
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Kan de beheersmap (%s) niet vergrendelen. Heeft u beheerdersrechten?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "dpkg werd onderbroken; voer handmatig '%s' uit om het probleem te verhelpen. "
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Niet vergrendeld"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "Geen spiegelbestand '%s' gevonden "
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
-#| msgid "No mirror file '%s' found "
 msgid "Can not read mirror file '%s'"
 msgstr "Geen spiegelbestand '%s' gevonden "
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Spiegelserver: %s]"
 
-#: methods/rred.cc:506
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3682,7 +3587,7 @@ msgstr ""
 "Kon %s niet patchen met mmap of met een bestandsoperatie - de patch lijkt "
 "beschadigd te zijn."
 
-#: methods/rred.cc:511
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3691,10 +3596,68 @@ msgstr ""
 "Kon %s niet patchen met mmap (maar zonder mmap-specifieke fout) - de patch "
 "lijkt beschadigd te zijn."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Verbinding werd voortijdig afgebroken"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Let op: Dit wordt automatische en bewust door dpkg gedaan."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Misvormde voorrangsingang %s op regel %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Misvormde voorrangsingang %s op regel %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Misvormde voorrangsingang %s op regel %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "decompressor"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "schrijf, de laatste %lu konden niet weggeschreven worden"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "Kon onmiddelijke configuratie van reeds uitgepakte '%s' niet uitvoeren. "
+#~ "Voor details zie 'man 5 apt.conf', onder APT::Immediate-Configure."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Fout tijdens verwerken van %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Fout tijdens verwerken van %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Fout tijdens verwerken van %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Fout tijdens verwerken van %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Fout tijdens verwerken van %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Fout tijdens verwerken van %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Fout tijdens verwerken van %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Fout tijdens verwerken van %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Fout tijdens verwerken van %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Fout tijdens verwerken van %s (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Interne fout, kon onderdeel niet vinden"
 
diff --git a/po/nn.po b/po/nn.po
index e3346edd1..231001ff9 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt_nn\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -19,153 +19,154 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Pakken %s versjon %s har eit krav som ikkje er oppfylt:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Tal p� pakkenamn: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Tal p� pakkenamn: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Vanlege pakkar: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Reine virtuelle pakkar: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Enkle virtuelle pakkar: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Samansette virtuelle pakkar: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Manglar: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Tal p� einskildversjonar: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Tal p� einskildversjonar: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Tal p� krav: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Tal p� ver./fil-forhold: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Tal p� ver./fil-forhold: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Tal p� tilbyr-forhold: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Tal p� strengar med jokerteikn: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Storleik p� kravs- og versjonsrom: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Slingringsmon: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Brukt plass i alt: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakkefila %s er ute av takt."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Fann ingen pakkar"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Du m� oppgi n�yaktig eitt mnster"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Finn ikkje pakken %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Spikra pakkar:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(ikkje funne)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Installert: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Pakke spikra til: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -238,11 +239,11 @@ 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:77
+#: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:92
+#: cmdline/apt-cdrom.cc:94
 #, fuzzy
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
@@ -250,20 +251,20 @@ msgstr ""
 " �%s�\n"
 "i stasjonen �%s� og trykk Enter.\n"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Klarte ikkje endra namnet p� %s til %s"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Ikkje parvise argument"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -291,12 +292,12 @@ msgstr ""
 "  -c=? Les denne oppsettsfila.\n"
 "  -o=? Set ei vilk�rleg innstilling, t.d. �-o dir::cache=/tmp�.\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s er ingen gyldig DEB-pakke."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -320,40 +321,40 @@ msgstr ""
 "  -c=? Les denne innstillingsfila.\n"
 "  -o=? Set ei vilk�rleg innstilling, t.d. �-o dir::cache=/tmp�.\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Klarte ikkje skriva til %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Finn ikkje debconf-versjonen. Er debconf installert?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Lista over pakkeutvidingar er for lang"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Feil ved lesing av katalogen %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Lista over kjeldeutvidingar er for lang"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Feil ved skriving av topptekst til innhaldsfila"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Feil ved lesing av %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 #, fuzzy
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
@@ -433,136 +434,136 @@ msgstr ""
 "  -c=?  Les denne oppsettsfila.\n"
 "  -o=? Set ei vilk�rleg innstilling."
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Ingen utval passa"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Enkelte filer manglar i pakkefilgruppa %s"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "Databasen er �ydelagd. Filnamnet er endra til %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB er for gammal, fors�kjer � oppgradere %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Klarte ikkje opna DB-fila %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Klarte ikkje f� status til %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Arkivet har ingen kontrollpost"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Klarte ikkje f� peikar"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "�: Klarte ikkje lesa katalogen %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "�: Klarte ikkje f� status til %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "F: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "�: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "F: Det er feil ved fila "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Klarte ikkje sl� opp %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Treklatring mislukkast"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Klarte ikkje opna %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Klarte ikkje lesa lenkja %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Klarte ikkje oppheva lenkja %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Klarte ikkje lenkja %s til %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink-grensa p� %sB er n�dd.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Arkivet har ikkje noko pakkefelt"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s har inga overstyringsoppf�ring\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s-vedlikehaldaren er %s, ikkje %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, fuzzy, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s har inga overstyringsoppf�ring\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, fuzzy, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s har inga overstyringsoppf�ring\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Klarte ikkje tildela minne"
 
@@ -572,18 +573,18 @@ msgid "Unable to open %s"
 msgstr "Klarte ikkje opna %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Misforma overstyring %s linje %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Misforma overstyring %s linje %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Misforma overstyring %s linje %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -591,63 +592,51 @@ msgstr "Misforma overstyring %s linje %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "Klarte ikkje lesa overstyringsfila %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Ukjend komprimeringsalgoritme %s"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Komprimert utdata %s treng eit komprimeringssett"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Klarte ikkje oppretta IPC-r�yr til underprosessen"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Klarte ikkje oppretta FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Klarte ikkje gafla"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Komprimer barn"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Intern feil, klarte ikkje oppretta %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Klarte ikkje oppretta underprosessen IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Klarte ikkje k�yra komprimeringa "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "dekomprimering"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "Klarte ikkje kommunisera med underprosess/fil"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Klarte ikkje lesa under utrekning av MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Problem ved oppheving av lenkje til %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Klarte ikkje endra namnet p� %s til %s"
@@ -656,75 +645,79 @@ msgstr "Klarte ikkje endra namnet p� %s til %s"
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex-kompileringsfeil - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "F�lgjande pakkar har krav som ikkje er oppfylte:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "men %s er installert"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "men l�t seg ikkje installera"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "men er ein virtuell pakke"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "men er ikkje installert"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "men skal ikkje installerast"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " eller"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Dei f�lgjande NYE pakkane vil verta installerte:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Dei f�lgjande pakkane vil verta FJERNA:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Dei f�lgjande pakkane er haldne tilbake:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Dei f�lgjande pakkane vil verta oppgraderte:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Dei f�lgjande pakkane vil verta NEDGRADERTE:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Dei f�lgjande pakkane som er haldne tilbake vil verta endra:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (fordi %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 #, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
@@ -733,60 +726,60 @@ msgstr ""
 "�TVARING: Dei f�lgjande n�dvendige pakkane vil verta fjerna.\n"
 "Dette b�r IKKJE gjerast utan at du er fullstendig klar over kva du gjer!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu oppgraderte, %lu nyleg installerte, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu installerte p� nytt, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderte, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Merk, vel %s i staden for regex �%s�\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Merk, vel %s i staden for regex �%s�\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Pakken %s er ein virtuell pakke, tilbydd av:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Installert]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 #, fuzzy
 msgid " [Not candidate version]"
 msgstr "Kandidatversjonar"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Du m� velja ein som skal installerast."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -797,184 +790,184 @@ msgstr ""
 "av ein annan pakke. Dette tyder at pakket manglar, er gjort overfl�dig\n"
 "eller er berre tilgjengeleg fr� ei anna kjelde\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Dei f�lgjande pakkane kan brukast i staden:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Det finst ingen installasjonskandidat for pakken %s"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Merk, vel %s i staden for %s\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Hoppar over %s, for den er installert fr� f�r og ikkje sett til "
 "oppgradering.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Hoppar over %s, for den er installert fr� f�r og ikkje sett til "
 "oppgradering.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "%s kan ikkje installerast p� nytt, for pakken kan ikkje lastast ned.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "Den nyaste versjonen av %s er installert fr� f�r.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Vald versjon %s (%s) for %s\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Vald versjon %s (%s) for %s\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Rettar p� krav ..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " mislukkast."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Klarte ikkje retta p� krav"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Klarte ikkje minimera oppgraderingsmengda"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Ferdig"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 "Du vil kanskje pr�va � retta p� desse ved � k�yra �apt-get -f install�."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nokre krav er ikkje oppfylte. Pr�v med �-f�."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "�TVARING: Klarer ikkje autentisere desse pakkane."
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Installer desse pakkane utan verifikasjon [j/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Nokre pakkar kunne ikkje bli autentisert"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Det oppstod problem, og �-y� vart brukt utan �--force-yes�"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Nokre pakkar m� fjernast, men fjerning er sl�tt av."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 #, fuzzy
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern feil ved tilleggjing av avleiing"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "M� henta %sB/%sB med arkiv.\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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "M� henta %sB med arkiv.\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:1154
+#: cmdline/apt-get.cc:1168
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\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:1159
+#: cmdline/apt-get.cc:1173
 #, fuzzy, c-format
 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:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Du har ikkje nok ledig plass i %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Du har ikkje nok ledig plass i %s."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "�Trivial Only� var spesifisert, men dette er ikkje noka triviell handling."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Ja, gjer som eg seier!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, fuzzy, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -985,28 +978,28 @@ msgstr ""
 "For � halda fram, m� du skriva n�yaktig �%s�.\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Avbryt."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du halda fram [J/n]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikkje henta %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Klarte ikkje henta nokre av filene"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Nedlastinga er ferdig i nedlastingsmodus"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1014,19 +1007,19 @@ msgstr ""
 "Klarte ikkje henta nokre av arkiva. Du kan pr�va med �apt-get update� eller "
 "�--fix-missing�."
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "�--fix-missing� og byte av medium er ikkje st�tta for tida"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Klarte ikkje retta opp manglande pakkar."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Avbryt installasjon."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1036,35 +1029,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Klarte ikkje f� status p� kjeldepakkelista %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Oppdateringskommandoen tek ingen argument"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1080,16 +1073,16 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "F�lgjande informasjon kan hjelpa med � l�ysa situasjonen:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern feil. AllUpgrade �ydelagde noko"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1099,7 +1092,7 @@ msgid_plural ""
 msgstr[0] "Dei f�lgjande NYE pakkane vil verta installerte:"
 msgstr[1] "Dei f�lgjande NYE pakkane vil verta installerte:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1107,20 +1100,20 @@ msgid_plural ""
 msgstr[0] "Dei f�lgjande NYE pakkane vil verta installerte:"
 msgstr[1] "Dei f�lgjande NYE pakkane vil verta installerte:"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern feil. AllUpgrade �ydelagde noko"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "Du vil kanskje pr�va � retta p� desse ved � k�yra �apt-get -f install�."
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1128,7 +1121,7 @@ msgstr ""
 "Nokre krav er ikkje oppfylte. Du kan pr�va �apt-get -f install� (eller velja "
 "ei l�ysing)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1140,81 +1133,81 @@ 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:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "�ydelagde pakkar"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Dei f�lgjande tilleggspakkane vil verta installerte:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "F�resl�tte pakkar:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Tilr�dde pakkar"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Fann ikkje pakken %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Reknar ut oppgradering ... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Mislukkast"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Ferdig"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil. AllUpgrade �ydelagde noko"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Klarte ikkje l�sa nedlastingskatalogen"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 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:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Finn ingen kjeldepakke for %s"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1222,105 +1215,105 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, 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:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "M� henta %sB med kjeldekodearkiv.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hent kjeldekode %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikkje henta nokre av arkiva."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen �%s� mislukkast.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggjekommandoen �%s� mislukkast.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Barneprosessen mislukkast"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 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:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Klarte ikkje henta byggjekrav for %s"
 
-#: cmdline/apt-get.cc:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen byggjekrav.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, 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:2889
+#: cmdline/apt-get.cc:2924
 #, 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:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1329,37 +1322,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:2957
+#: cmdline/apt-get.cc:2992
 #, 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:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikkje behandla byggjekrava"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Koplar til %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "St�tta modular:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1445,7 +1438,7 @@ msgstr ""
 "til apt-get(8), sources.list(5) og apt.conf(5).\n"
 "                       APT har superku-krefter.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1453,33 +1446,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Treff "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Hent:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ign "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Feil "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Henta %sB p� %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Arbeider]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1490,46 +1483,62 @@ msgstr ""
 " �%s�\n"
 "i stasjonen �%s� og trykk Enter.\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "men er ikkje installert"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "Den nyaste versjonen av %s er installert fr� f�r.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "Den nyaste versjonen av %s er installert fr� f�r.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Klarte ikkje opna %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1551,11 +1560,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Ukjend pakkeoppslag"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1615,197 +1624,199 @@ msgstr "er viktige. Rett opp dei feila og [i]nstaller p� nytt."
 msgid "Merging available information"
 msgstr "Flettar informasjon om tilgjengelege pakkar"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Klarte ikkje oppretta r�yr"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Klarte ikkje k�yra gzip "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "�ydelagt arkiv"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar-sjekksummen mislukkast, arkivet er �ydelagt"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Ukjend TAR-hovud type %u, medlem %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Ugyldig arkivsignatur"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Feil ved lesing av arkivmedlemshovud"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, fuzzy, c-format
 msgid "Invalid archive member header %s"
 msgstr "Ugyldig arkivmedlemshovud"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Ugyldig arkivmedlemshovud"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Arkivet er for kort"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Klarte ikkje lesa arkivhovuda"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "DropNode vart kalla p� ein node som framleis er lenkja"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Fann ikkje n�kkelelementet."
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Klarte ikkje tildela avleiing"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Intern feil i AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Pr�ver � skriva over ei avleiing, %s -> %s og %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Dobbel tilleggjing av avleiing %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Dobbel oppsettsfil %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, fuzzy, c-format
 msgid "Failed to write file %s"
 msgstr "Klarte ikkje skriva fila %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Klarte ikkje lukka fila %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Stigen %s er for lang"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Pakkar ut %s meir enn �in gong"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Katalogen %s er avleidd"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Avleiingsstigen er for lang"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "Fann ikkje noden i n�kkelb�tta"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Stigen er for lang"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Skriv over pakketreff utan versjon for %s"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, 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"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Klarte ikkje lesa %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Klarte ikkje f� status til %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Klarte ikkje fjerna %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Klarte ikkje oppretta %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Klarte ikkje f� status til %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "Infokatalogen og den mellombelse katalogen m� vera p� det same filsystemet"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Les pakkelister"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Klarte ikkje byta til adminkatalogen %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Intern feil ved henting av pakkenamn"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Les filliste"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1816,114 +1827,115 @@ msgstr ""
 "denne fila, b�r du oppretta ho som ei tom fil og installera den same "
 "versjonen av pakken p� nytt."
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Klarte ikkje lesa listefila %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Intern feil ved henting av node"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Klarte ikkje opna avleiingsfila %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "Avleiingsfila er �ydelagd"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Ugyldig linje i avleiingsfila: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Intern feil ved tilleggjing av avleiing"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "Pakkelageret m� f�rst klargjerast"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Fann ikkje �Package:�-linja, offset %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "�ydelagd �ConfFile�-del i statusfila. Offset %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Feil ved tolking av MD5. Offset %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Dette er ikkje eit gyldig DEB-arkiv, manglar �%s�-medlemmen"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 apt-inst/deb/debfile.cc:55
 #, fuzzy, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 msgstr ""
 "Dette er ikkje eit gyldig DEB-arkiv, det har ingen �%s� eller �%s�-medlem"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Klarte ikkje byta til %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Intern feil, fann ikkje medlemmen %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Fann ikkje noka gyldig kontrollfil"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Kontrollfila kan ikkje tolkast"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Klarte ikkje opna r�yr for %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Lesefeil fr� %s-prosessen"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Klarte ikkje f� status"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Klarte ikkje setja endringstidspunkt"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Klarte ikkje lesa CD-ROM-databasen %s"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1931,58 +1943,58 @@ msgstr ""
 "Bruk �apt-cdrom� for � gjera denne CD-plata tilgjengeleg for APT. Du kan "
 "ikkje bruka �apt-get update� til � leggja til nye CD-plater."
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "Feil CD-plate"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 "Klarte ikkje montera CD-plata i %s. Det kan henda plata framleis er i bruk."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 #, fuzzy
 msgid "Disk not found."
 msgstr "Fann ikkje fila"
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Fann ikkje fila"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Ugyldig URI. Lokale URI-ar kan ikkje starta med //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Loggar inn"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Klarte ikkje avgjera namnet p� motparten"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Klarte ikkje avgjera det lokale namnet"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Tenaren nekta oss � kopla til, og sa: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -1990,319 +2002,324 @@ msgstr ""
 "Ein mellomtenar er oppgitt, men ikkje noko innloggingsskript. Feltet "
 "�Acquire::ftp::ProxyLogin� er tomt."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Kommandoen �%s� i innlogginsskriptet mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Tidsavbrot p� samband"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Tenaren lukka sambandet"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Lesefeil"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Eit svar flaumde over bufferen."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Protokoll�ydeleggjing"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Skrivefeil"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Klarte ikkje oppretta sokkel"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "Klarte ikkje kopla til datasokkel, tidsavbrot p� sambandet"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Klarte ikkje kopla til passiv sokkel."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo klarte ikkje oppretta ein lyttesokkel"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Klarte ikkje binda til sokkel"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Klarte ikkje lytta til sokkel"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Klarte ikkje avgjera sokkelnamnet"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Klarte ikkje senda PORT-kommandoen"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Ukjend adressefamilie %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Tidsavbrot p� tilkopling til datasokkel"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Klarte ikkje godta tilkoplinga"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av n�kkel for fil"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Klarte ikkje henta fila, tenaren sa �%s�"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Tidsavbrot p� datasokkelen"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Dataoverf�ringa mislukkast, tenaren sa �%s�"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Sp�rjing"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Klarte ikkje starta "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Koplar til %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Klarte ikkje initiera sambandet til %s:%s (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Koplar til %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Klarte ikkje sl� opp �%s�"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Mellombels feil ved oppslag av �%s�"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, 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:243
+#: methods/connect.cc:247
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Klarte ikkje kopla til %s %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Dei f�lgjande tilleggspakkane vil verta installerte:"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Ventar p� hovud"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Fekk ei enkel hovudlinje over %u teikn"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "�ydelagd hovudlinje"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-tenaren sende eit ugyldig svarhovud"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-tenaren sende eit ugyldig �Content-Length�-hovud"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-tenaren sende eit ugyldig �Content-Range�-hovud"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Denne HTTP-tenaren har �ydelagd st�tte for omr�de"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Ukjend datoformat"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Utvalet mislukkast"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Tidsavbrot p� sambandet"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing fr� tenaren. Sambandet vart lukka i andre enden"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Feil ved lesing fr� tenaren"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "Klarte ikkje skriva fila %s"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "�ydelagde hovuddata"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Sambandet mislukkast"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Kan ikkje utf�ra mmap p� ei tom fil"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Klarte ikkje opna r�yr for %s"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Klarte ikkje laga mmap av %lu byte"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "Klarte ikkje opna %s"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "Klarte ikkje starta "
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Klarte ikkje laga mmap av %lu byte"
+
+#: apt-pkg/contrib/mmap.cc:311
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Klarte ikkje skriva fila %s"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2331,93 +2348,93 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Fann ikkje utvalet %s"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Ukjend typeforkorting: �%c�"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaksfeil %s:%u: Blokka startar utan namn."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntaksfeil %s:%u: Misforma tagg"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntaksfeil %s:%u: Ekstra rot etter verdien"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det �vste niv�et"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntaksfeil %s:%u: For mange n�sta inkluderte filer"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntaksfeil %s:%u: Inkludert herifr�"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaksfeil %s:%u: Direktivet �%s� er ikkje st�tta"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det �vste niv�et"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s ... Feil"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s ... Ferdig"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Kjenner ikkje kommandolinjevalet �%c� (fr� %s)."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Skj�nar ikkje kommandolinjevalet %s"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Kommandolinjevalet %s er ikkje boolsk"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Valet %s krev eit argument."
@@ -2427,344 +2444,362 @@ msgstr "Valet %s krev eit argument."
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Val %s: Spesifikasjonen av oppsettselementet m� ha ein =<verdi>."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Valet %s m� ha eit heiltalsargument, ikkje �%s�"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Valet �%s� er for langt"
 
-#: 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 "Skj�nar ikkje %s. Pr�v �true� eller �false�."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Ugyldig operasjon %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Klarte ikkje f� status til monteringspunktet %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Klarte ikkje byta til %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Klarte ikkje f� status til CD-ROM"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Klarte ikkje opna l�sefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Klarte ikkje l�sa %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Venta p� %s, men den fanst ikkje"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprosessen %s mottok ein segmenteringsfeil."
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Underprosessen %s mottok ein segmenteringsfeil."
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprosessen %s returnerte ein feilkode (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprosessen %s avslutta uventa"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Klarte ikkje opna fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Klarte ikkje opna r�yr for %s"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Klarte ikkje oppretta underprosessen IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Klarte ikkje k�yra komprimeringa "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, 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:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, 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:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problem ved l�sing av fila"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem ved l�sing av fila"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem ved synkronisering av fila"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem ved oppheving av lenkje til fila"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Problem ved synkronisering av fila"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Tomt pakkelager"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Pakkelagerfila er �ydelagd"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "Versjonen til pakkelagerfila er ikkje kompatibel"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Pakkelagerfila er �ydelagd"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT st�ttar ikkje versjonssystemet �%s�"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "Pakkelageret er bygd for ein annan arkitektur"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Krav"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Forkrav"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Forslag"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Tilr�dingar"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Konflikt"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Byter ut"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Foreldar"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "viktig"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "p�kravd"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "vanleg"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "valfri"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "tillegg"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Byggjer kravtre"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Kandidatversjonar"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Genererer kravforhold"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 #, fuzzy
 msgid "Reading state information"
 msgstr "Flettar informasjon om tilgjengelege pakkar"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Klarte ikkje opna %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Klarte ikkje skriva fila %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Klarte ikkje tolka pakkefila %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Misforma linje %lu i kjeldelista %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Linja %u i kjeldelista %s er for lang."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Misforma linje %u i kjeldelista %s (type)"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, 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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Klarte ikkje opna fila %s"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2776,25 +2811,18 @@ msgstr ""
 "om du verkeleg vil gjera det, kan du bruka innstillinga �APT::Force-"
 "LoopBreak�."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Indeksfiltypen �%s� er ikkje st�tta"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 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:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2802,12 +2830,12 @@ msgstr ""
 "Feil, �pkgProblemResolver::Resolve� har laga brot. Dette kan skuldast pakkar "
 "som er haldne tilbake."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 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:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2816,44 +2844,44 @@ msgstr ""
 "Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle "
 "filer er brukte i staden."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Listekatalogen %spartial manglar."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Arkivkatalogen %spartial manglar."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "Klarte ikkje l�sa listekatalogen"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, fuzzy, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Les filliste"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Finn ikkje metodedrivaren %s."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s starta ikkje rett"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
@@ -2861,192 +2889,154 @@ msgstr ""
 " �%s�\n"
 "i stasjonen �%s� og trykk Enter.\n"
 
-#: apt-pkg/init.cc:147
+#: 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:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Klarte ikkje f� status p� %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Du m� leggja nokre kjelde-URI-ar i fila sources.list."
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Klarte ikkje tolka eller opna pakkelista eller tilstandsfila."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Du vil kanskje pr�va � retta p� desse problema ved � k�yra �apt-get update�."
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Kjeldelista kan ikkje lesast."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Skj�nar ikkje spikringstypen %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Ingen prioritet (eller null) oppgitt for spiker"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Feil ved behandling av %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Feil ved behandling av %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Feil ved behandling av %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Feil ved behandling av %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Feil ved behandling av %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Feil ved behandling av %s (NewVersion1)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Feil ved behandling av %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Feil ved behandling av %s (NewFileVer1)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Feil ved behandling av %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "J�ss, du har overg�tt talet p� pakkenamn som APT kan handtera."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "J�ss, du har overg�tt talet p� versjonar som APT kan handtera."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "J�ss, du har overg�tt talet p� versjonar som APT kan handtera."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 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:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Feil ved behandling av %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Feil ved behandling av %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Klarte ikkje f� status p� kjeldepakkelista %s"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Samlar inn filtilbod"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "IU-feil ved lagring av kjeldelager"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "endring av namn mislukkast, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "Feil MD5-sum"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Feil MD5-sum"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3054,12 +3044,12 @@ msgid ""
 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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3068,7 +3058,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:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3076,48 +3066,48 @@ msgid ""
 msgstr ""
 "Fann ikkje fila for pakken %s. Det kan henda du m� fiksa denne pakken sj�lv."
 
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1768
 #, 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:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Feil storleik"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Merk, vel %s i staden for %s\n"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Ugyldig linje i avleiingsfila: %s"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3126,64 +3116,64 @@ msgstr ""
 "Brukar monteringspunktet %s for CD-ROM\n"
 "Monterer CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Identifiserer ... "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Lagra etikett: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "Avmonterer CD-ROM ..."
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Brukar monteringspunktet %s for CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Avmonterer CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Ventar p� disk ...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Monterer CD-ROM ...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Leitar etter indeksfiler p� disken ...\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, fuzzy, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
 msgstr "Lagra etikett: %s \n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Det er ikkje eit gyldig namn, pr�v igjen.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3192,293 +3182,368 @@ msgstr ""
 "Disken vert kalla: \n"
 "�%s�\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Kopierer pakkelister ..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Skriv ny kjeldeliste\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "Kjeldelisteoppf�ringar for denne disken er:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skreiv %i postar.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skreiv %i postar med %i manglande filer.\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, 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"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Feil MD5-sum"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Avbryt installasjon."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Fann ikkje utg�va �%s� av �%s�"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Fann ikkje versjonen �%s� av �%s�"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Fann ikkje pakken %s"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Fann ikkje pakken %s"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "  Installert: "
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Koplar til %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Klarte ikkje fjerna %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Listekatalogen %spartial manglar."
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Klarte ikkje opna fila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Installert: "
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Tilr�dingar"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Klarte ikkje fjerna %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Klarte ikkje l�sa listekatalogen"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Klarte ikkje opna fila %s"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Sambandet vart uventa stengd"
 
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Misforma overstyring %s linje %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Misforma overstyring %s linje %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Misforma overstyring %s linje %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "dekomprimering"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "lese, har framleis %lu att � lesa, men ingen att"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "skrive, har framleis %lu att � skrive, men klarte ikkje"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Feil ved behandling av %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Feil ved behandling av %s (UsePackage1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Feil ved behandling av %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Feil ved behandling av %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Feil ved behandling av %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Feil ved behandling av %s (NewVersion1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Feil ved behandling av %s (UsePackage3)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Feil ved behandling av %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Feil ved behandling av %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Feil ved behandling av %s (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Intern feil, fann ikkje medlem"
 
diff --git a/po/pl.po b/po/pl.po
index 7e3736f5f..69bc3e893 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.23.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-14 12:59+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+0200\n"
 "PO-Revision-Date: 2012-01-22 20:35+0100\n"
 "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -23,151 +23,152 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Pakiet %s w wersji %s ma niespełnione zależności:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Liczba nazw pakietów: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Liczba wszystkich typów pakietów: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Zwykłych pakietów: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Czysto wirtualnych pakietów: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Pojedynczych pakietów wirtualnych: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Mieszanych pakietów wirtualnych: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Brakujących: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "W sumie różnych wersji: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "W sumie różnych opisów: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "W sumie zależności: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "W sumie zależności wersja/plik: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "W sumie zależności opis/plik: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "W sumie mapowań zapewnień: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "W sumie dopasowanych napisów: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Sumaryczny rozmiar obszaru zależności od wersji: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Sumaryczny rozmiar niewykorzystanego miejsca: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Całkowity rozmiar: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Plik pakietu %s jest przestarzały."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Nie znaleziono żadnych pakietów"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "Należy podać przynajmniej jeden wzorzec"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 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:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nie udało się odnaleźć pakietu %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Plików pakietów:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Przypięte pakiety:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(nie znaleziono)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Zainstalowana: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Kandydująca: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(brak)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Sposób przypięcia: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Tabela wersji:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3235 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -238,28 +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:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 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:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Nie udało się zamontować \"%s\" w \"%s\""
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Należy powtórzyć ten proces dla reszty płyt."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Argumenty nie są w parach"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -287,12 +288,12 @@ msgstr ""
 "  -c=? Czyta wskazany plik konfiguracyjny.\n"
 "  -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s nie jest prawidłowym pakietem DEB."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -316,40 +317,40 @@ msgstr ""
 "  -c=? Czyta wskazany plik konfiguracyjny.\n"
 "  -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1164
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nie udało się pisać do %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Nie udało się pobrać wersji debconf. Czy debconf jest zainstalowany?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Lista rozszerzeń pakietów jest zbyt długa"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Błąd przetwarzania katalogu %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Lista rozszerzeń źródeł jest zbyt długa"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Błąd przy zapisywaniu nagłówka do pliku zawartości"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Błąd podczas przetwarzania zawartości %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -432,26 +433,26 @@ msgstr ""
 "  -c=?  Czyta wskazany plik konfiguracyjny\n"
 "  -o=?  Ustawia dowolną opcję konfiguracji"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Nie dopasowano żadnej nazwy"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Brakuje pewnych plików w grupie plików pakietów \"%s\""
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "Baza była uszkodzona, plik został przeniesiony do %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "Baza jest przestarzała, próbuję zaktualizować %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -459,111 +460,111 @@ msgstr ""
 "Niepoprawny format bazy. Jeśli zaktualizowano ze starszej wersji apt, proszę "
 "usunąć i utworzyć ponownie bazę danych."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Nie udało się otworzyć pliku bazy %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Nie udało się wykonać operacji stat na %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Archiwum nie posiada rekordu kontrolnego"
 
-#: ftparchive/cachedb.cc:452
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Nie udało się pobrać kursora"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Nie udało się odczytać katalogu %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Nie można wykonać operacji stat na %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: Błędy odnoszą się do pliku "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Nie udało się przetłumaczyć nazwy %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Przejście po drzewie nie powiodło się"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Nie udało się otworzyć %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " Odłączenie %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Nie udało się odczytać dowiązania %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Nie udało się usunąć %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Nie udało się dowiązać %s do %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Osiągnięto ograniczenie odłączania %sB.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Archiwum nie posiadało pola pakietu"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s nie posiada wpisu w pliku override\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  opiekunem %s jest %s, a nie %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s nie posiada wpisu w pliku override źródeł\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s nie posiada również wpisu w pliku override binariów\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Nie udało się zaalokować pamięci"
 
@@ -573,18 +574,18 @@ msgid "Unable to open %s"
 msgstr "Nie można otworzyć %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Nieprawidłowa linia %2$lu #1 pliku override %1$s"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Nieprawidłowa linia %2$lu #2 pliku override %1$s"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Nieprawidłowa linia %2$lu #3 pliku override %1$s"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -592,63 +593,51 @@ msgstr "Nieprawidłowa linia %2$lu #3 pliku override %1$s"
 msgid "Failed to read the override file %s"
 msgstr "Nie udało się czytać pliku override %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Nieznany algorytm kompresji \"%s\""
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Skompresowany plik wynikowy %s wymaga podania kompresji"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Nie udało się utworzyć potoku IPC do podprocesu"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Nie udało się utworzyć obiektu FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Nie udało się utworzyć procesu potomnego"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Potomny proces kompresujący"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Błąd wewnętrzny, nie udało się utworzyć %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Nie udało się utworzyć IPC z podprocesem"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Nie udało się uruchomić kompresora "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "dekompresor"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "Zawiodła operacja IO na pliku/podprocesie"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Nie udało się czytanie w czasie liczenia skrótu MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Problem przy usuwaniu %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Nie udało się zmienić nazwy %s na %s"
@@ -657,75 +646,79 @@ msgstr "Nie udało się zmienić nazwy %s na %s"
 msgid "Y"
 msgstr "T"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Błąd kompilacji wyrażenia regularnego - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Następujące pakiety mają niespełnione zależności:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "ale %s jest zainstalowany"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ale %s ma zostać zainstalowany"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "ale nie da się go zainstalować"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "ale jest pakietem wirtualnym"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "ale nie jest zainstalowany"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "ale nie zostanie zainstalowany"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " lub"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Zostaną zainstalowane następujące NOWE pakiety:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Następujące pakiety zostaną USUNIĘTE:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Następujące pakiety zostały zatrzymane:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Następujące pakiety zostaną zaktualizowane:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Zostaną zmienione następujące zatrzymane pakiety:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (z powodu %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -733,59 +726,59 @@ msgstr ""
 "UWAGA: Zostaną usunięte następujące istotne pakiety.\n"
 "NIE należy kontynuować, jeśli nie jest się pewnym tego co się robi!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu ponownie instalowanych, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu cofniętych wersji, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu usuwanych i %lu nieaktualizowanych.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Uwaga, wybieranie %s dla zadania \"%s\"\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Uwaga, wybieranie %s dla wyrażenia \"%s\"\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Pakiet %s jest pakietem wirtualnym zapewnianym przez:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Zainstalowany]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr " [Brak wersji kandydującej]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Należy jednoznacznie wybrać jeden z nich do instalacji."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -796,129 +789,129 @@ msgstr ""
 "Zazwyczaj oznacza to, że pakietu brakuje, został zastąpiony przez inny\n"
 "pakiet lub nie jest dostępny przy pomocy obecnie ustawionych źródeł.\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Jednak następujące pakiety go zastępują:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Pakiet %s nie ma kandydata do instalacji"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "Pakiety wirtualne, takie jak \"%s\" nie mogą być usunięte\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Uwaga, wybieranie \"%s\" zamiast \"%s\"\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Pomijanie %s, jest już zainstalowane, a nie została wybrana aktualizacja.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Pomijanie %s, nie jest zainstalowane, a wybrano wyłącznie aktualizacje.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "Ponowna instalacja pakietu %s nie jest możliwa, nie może on zostać pobrany.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s jest już w najnowszej wersji.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2096 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s zaznaczony jako zainstalowany ręcznie.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Wybrano wersję \"%s\" (%s) pakietu \"%s\"\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Wybrano wersję \"%s\" (%s) pakietu \"%s\", z powodu \"%s\"\n"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Pakiet %s nie jest zainstalowany, więc nie zostanie usunięty.\n"
 
-#: cmdline/apt-get.cc:969
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Naprawianie zależności..."
 
-#: cmdline/apt-get.cc:972
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " nie udało się."
 
-#: cmdline/apt-get.cc:975
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Nie udało się naprawić zależności"
 
-#: cmdline/apt-get.cc:978
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Nie udało się zminimalizować zbioru aktualizacji"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Gotowe"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić."
 
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Niespełnione zależności. Proszę spróbować użyć -f."
 
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "UWAGA: Następujące pakiety nie mogą zostać zweryfikowane!"
 
-#: cmdline/apt-get.cc:1016
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Zignorowano ostrzeżenie uwierzytelniania.\n"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Zainstalować te pakiety bez weryfikacji [t/N]? "
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Niektóre pakiety nie mogły zostać zweryfikowane"
 
-#: cmdline/apt-get.cc:1034 cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Wystąpiły problemy, a użyto -y bez --force-yes"
 
-#: cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Błąd wewnętrzny, użyto InstallPackages z uszkodzonymi pakietami!"
 
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone."
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Błąd wewnętrzny, sortowanie niezakończone"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Wystąpił dziwny błąd - rozmiary się nie zgadzają. Proszę to zgłosić pod "
@@ -926,53 +919,53 @@ 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:1140
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Konieczne pobranie %sB/%sB archiwów.\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:1145
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Konieczne pobranie %sB archiwów.\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:1152
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\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:1157
+#: cmdline/apt-get.cc:1173
 #, c-format
 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:1172 cmdline/apt-get.cc:1175 cmdline/apt-get.cc:2514
-#: cmdline/apt-get.cc:2517
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nie udało się ustalić ilości wolnego miejsca w %s"
 
-#: cmdline/apt-get.cc:1185
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Niestety w %s nie ma wystarczającej ilości wolnego miejsca."
 
-#: cmdline/apt-get.cc:1201 cmdline/apt-get.cc:1221
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Nakazano wykonywać tylko trywialne operacje, a ta do nich nie należy."
 
 # Bezpieczniej jest nie używać tu polskich znaków.
-#: cmdline/apt-get.cc:1203
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Tak, jestem pewien!"
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -983,28 +976,28 @@ msgstr ""
 "Aby kontynuować proszę napisać zdanie \"%s\"\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1211 cmdline/apt-get.cc:1230
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Przerwane."
 
-#: cmdline/apt-get.cc:1226
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Kontynuować [T/n]? "
 
-#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:2579 apt-pkg/algorithms.cc:1445
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Nie udało się pobrać %s  %s\n"
 
-#: cmdline/apt-get.cc:1316
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Nie udało się pobrać niektórych plików"
 
-#: cmdline/apt-get.cc:1317 cmdline/apt-get.cc:2591
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Ukończono pobieranie w trybie samego pobierania"
 
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1012,19 +1005,19 @@ msgstr ""
 "Nie udało się pobrać niektórych archiwów, proszę spróbować uruchomić apt-get "
 "update lub użyć opcji --fix-missing."
 
-#: cmdline/apt-get.cc:1327
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing i zamiana nośników nie są obecnie obsługiwane"
 
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Nie udało się poprawić brakujących pakietów."
 
-#: cmdline/apt-get.cc:1333
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Przerywanie instalacji"
 
-#: cmdline/apt-get.cc:1361
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1041,35 +1034,35 @@ msgstr[2] ""
 "Następujące pakiety zniknęły z tego systemu, ponieważ wszystkie ich pliki "
 "zostały nadpisane przez inne pakiety:"
 
-#: cmdline/apt-get.cc:1365
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Uwaga: dpkg wykonał to automatycznie i celowo."
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Ignorowanie niedostępnego wydania docelowego %s pakietu %s"
 
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Zmieniono wybrany pakiet źródłowy na \"%s\" z \"%s\"\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1573
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Ignorowanie niedostępnej wersji \"%s\" pakietu \"%s\""
 
-#: cmdline/apt-get.cc:1589
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Polecenie update nie wymaga żadnych argumentów"
 
-#: cmdline/apt-get.cc:1652
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony"
 
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1087,15 +1080,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1759 cmdline/apt-get.cc:1929
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:"
 
-#: cmdline/apt-get.cc:1763
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Błąd wewnętrzny spowodowany przez AutoRemover"
 
-#: cmdline/apt-get.cc:1770
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1111,7 +1104,7 @@ msgstr[2] ""
 "Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej "
 "wymagane:"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1126,20 +1119,20 @@ msgstr[2] ""
 "%lu pakietów zostało zainstalowanych automatycznie i nie są już więcej "
 "wymagane.\n"
 
-#: cmdline/apt-get.cc:1776
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Aby je usunąć należy użyć \"apt-get autoremove\"."
 
-#: cmdline/apt-get.cc:1795
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Błąd wewnętrzny spowodowany przez AllUpgrade"
 
-#: cmdline/apt-get.cc:1894
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "Należy uruchomić \"apt-get -f install\", aby naprawić poniższe problemy:"
 
-#: cmdline/apt-get.cc:1898
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1147,7 +1140,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:1914
+#: cmdline/apt-get.cc:1929
 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"
@@ -1159,33 +1152,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:1932
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Pakiety są uszkodzone"
 
-#: cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:"
 
-#: cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Sugerowane pakiety:"
 
-#: cmdline/apt-get.cc:2049
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Polecane pakiety:"
 
-#: cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nie udało się odnaleźć pakietu %s"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s zaznaczony jako zainstalowany automatycznie.\n"
 
-#: cmdline/apt-get.cc:2106 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -1193,43 +1186,43 @@ msgstr ""
 "To polecenie jest przestarzałe. Prosimy używać \"apt-mark auto\" i \"apt-"
 "mark manual\"."
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Obliczanie aktualizacji..."
 
-#: cmdline/apt-get.cc:2125 methods/ftp.cc:708 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Nie udało się"
 
-#: cmdline/apt-get.cc:2130
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Gotowe"
 
-#: cmdline/apt-get.cc:2197 cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Błąd wewnętrzny, spowodowany przez moduł rozwiązywania problemów"
 
-#: cmdline/apt-get.cc:2233 cmdline/apt-get.cc:2269
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Nie udało się zablokować katalogu pobierania"
 
-#: cmdline/apt-get.cc:2320
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr "Pobieranie %s %s"
 
-#: cmdline/apt-get.cc:2376
+#: cmdline/apt-get.cc:2396
 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:2416 cmdline/apt-get.cc:2728
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, 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:2433
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1239,7 +1232,7 @@ msgstr ""
 "pod adresem:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2438
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1251,70 +1244,70 @@ msgstr ""
 "by pobrać najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego "
 "pakietu.\n"
 
-#: cmdline/apt-get.cc:2491
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Pomijanie już pobranego pliku \"%s\"\n"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2548
 #, 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:2537
+#: cmdline/apt-get.cc:2557
 #, 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:2542
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Konieczne pobranie %sB archiwów źródeł.\n"
 
-#: cmdline/apt-get.cc:2548
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Pobieranie źródeł %s\n"
 
-#: cmdline/apt-get.cc:2586
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Nie udało się pobrać niektórych archiwów."
 
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2637
 #, 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:2629
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n"
 
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2650
 #, 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:2652
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Polecenie budowania \"%s\" zawiodło.\n"
 
-#: cmdline/apt-get.cc:2672
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Proces potomny zawiódł"
 
-#: cmdline/apt-get.cc:2691
+#: cmdline/apt-get.cc:2711
 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:2716
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -1323,17 +1316,17 @@ msgstr ""
 "Nie znaleziono informacji o architekturze dla %s. Proszę zapoznać się z apt."
 "conf(5) APT::Architectures"
 
-#: cmdline/apt-get.cc:2733
+#: cmdline/apt-get.cc:2753
 #, 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:2753
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nie ma zależności dla budowania.\n"
 
-#: cmdline/apt-get.cc:2883
+#: cmdline/apt-get.cc:2903
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1342,7 +1335,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:2904
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1351,14 +1344,14 @@ msgstr ""
 "Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono "
 "pakietu %s"
 
-#: cmdline/apt-get.cc:2927
+#: cmdline/apt-get.cc:2947
 #, 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:2966
+#: cmdline/apt-get.cc:2986
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1367,7 +1360,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:2972
+#: cmdline/apt-get.cc:2992
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1376,30 +1369,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:2995
+#: cmdline/apt-get.cc:3015
 #, 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:3011
+#: cmdline/apt-get.cc:3031
 #, 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:3016
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Nie udało się przetworzyć zależności dla budowania"
 
-#: cmdline/apt-get.cc:3109 cmdline/apt-get.cc:3121
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Dziennik zmian %s (%s)"
 
-#: cmdline/apt-get.cc:3240
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Obsługiwane moduły:"
 
-#: cmdline/apt-get.cc:3281
+#: cmdline/apt-get.cc:3301
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1487,7 +1480,7 @@ msgstr ""
 "apt-get(8), sources.list(5) i apt.conf(5).\n"
 "                         Ten APT ma moce Super Krowy.\n"
 
-#: cmdline/apt-get.cc:3444
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1500,35 +1493,35 @@ msgstr ""
 "      na związku z rzeczywistą sytuacją!"
 
 # Ujednolicono z aptitude
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Stary "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Pobieranie:"
 
 # Wyrównane do Hit i Err.
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ign.  "
 
 # Wyrównane do Hit i Ign.
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Błąd  "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Pobrano %sB w %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Pracuje]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1539,48 +1532,64 @@ msgstr ""
 " \"%s\"\n"
 "do napędu \"%s\" i nacisnąć enter\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s nie może zostać oznaczony, ponieważ nie jest zainstalowany.\n"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s został już ustawiony jako zainstalowany ręcznie.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s został już ustawiony jako zainstalowany automatycznie.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s został już zatrzymany.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s został już odznaczony jako zatrzymany.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s został zatrzymany.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Odznaczono zatrzymanie %s\n"
 
 # Musi pasować do su i sudo.
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 "Uruchomienie dpkg nie powiodło się. Czy użyto uprawnień administratora?"
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1623,11 +1632,11 @@ msgstr ""
 "Proszę zapoznać się ze stronami podręcznika systemowego apt-mark(8)\n"
 "i apt.conf(5), aby uzyskać więcej informacji."
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Nieznane informacje o pakiecie!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1690,196 +1699,198 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Łączenie informacji o dostępnych pakietach"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Nie udało się utworzyć potoków"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Nie udało się uruchomić programu gzip "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Uszkodzone archiwum"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Niepoprawna suma kontrolna tar, archiwum jest uszkodzone"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Nieznany typ nagłówka TAR %u, składnik %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Nieprawidłowy podpis archiwum"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Błąd przy czytaniu nagłówka składnika archiwum"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "Nieprawidłowy nagłówek składnika archiwum: %s"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Nieprawidłowy nagłówek składnika archiwum"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Archiwum jest za krótkie"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Nie udało się odczytać nagłówków archiwum"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "DropNode wywołane na wciąż podłączonym węźle"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Nie udało się odnaleźć elementu tablicy haszującej!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Nie udało się utworzyć ominięcia"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Błąd wewnętrzny w AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Próba nadpisania ominięcia, %s -> %s i %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Podwójne dodanie ominięcia %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Zduplikowany plik konfiguracyjny %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Nie udało się zapisać pliku %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Nie udało się zamknąć pliku %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Ścieżka %s jest zbyt długa"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Wypakowanie %s więcej niż raz"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Ominięcie katalogu %s"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Zbyt długa ścieżka ominięcia"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 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:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Ścieżka jest zbyt długa"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Nadpisujący pakiet nie pasuje z wersją %s"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Plik %s/%s nadpisuje plik w pakiecie %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:454 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:353
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nie można czytać %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Nie można wykonać operacji stat na %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Nie udało się usunąć %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Nie można utworzyć %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Nie udało się wykonać operacji stat na %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Pliki info i katalog tymczasowy muszą być w tym samym systemie plików"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1063
-#: apt-pkg/pkgcachegen.cc:1167 apt-pkg/pkgcachegen.cc:1173
-#: apt-pkg/pkgcachegen.cc:1335
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Czytanie list pakietów"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Nie udało się przejść do katalogu administracyjnego %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Błąd wewnętrzny podczas pobierania nazwy pakietu"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Czytanie listy plików"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1890,115 +1901,116 @@ msgstr ""
 "tego pliku, należy utworzyć go jako pusty plik i bezzwłocznie przeinstalować "
 "tę samą wersję pakietu!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Nie udało się przeczytać pliku listy %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Błąd wewnętrzny przy pobieraniu węzła"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Nie udało się otworzyć pliku ominięć %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "Plik ominięć jest uszkodzony"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Nieprawidłowa linia w pliku ominięć: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Błąd wewnętrzny przy dodawaniu ominięcia"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "Magazyn podręczny pakietów musi zostać wcześniej zainicjalizowany"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Nie udało się znaleźć nagłówka Package:, offset %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Błędna sekcja ConfFile w pliku stanu. Offset %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Błąd przy czytaniu skrótu MD5. Offset %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "To nie jest poprawne archiwum DEB, brakuje składnika \"%s\""
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 "To nie jest poprawne archiwum DEB, brakuje składnika \"%s\", \"%s\" lub \"%s"
 "\""
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Nie udało się przejść do %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Błąd wewnętrzny, nie udało się odnaleźć składnika %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Nie udało się odnaleźć poprawnego pliku kontrolnego"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Plik kontrolny nie może zostać poprawnie zinterpretowany"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr "Puste pliki nie mogą być prawidłowymi archiwami"
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Nie udało się otworzyć potoku dla %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Błąd odczytu z procesu %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:527
-#: methods/rred.cc:536
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Nie udało się wykonać operacji stat"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:533
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Nie udało się ustawić czasu modyfikacji"
 
-#: methods/cdrom.cc:200
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Nie można odczytać bazy danych CD-ROM-ów %s"
 
-#: methods/cdrom.cc:209
+#: 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"
@@ -2006,56 +2018,56 @@ msgstr ""
 "Proszę użyć programu apt-cdrom, aby APT mógł rozpoznać tę płytę CD. Nowych "
 "płyt nie można dodawać przy pomocy polecenia apt-get update"
 
-#: methods/cdrom.cc:219
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "Niewłaściwa płyta CD"
 
-#: methods/cdrom.cc:246
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Nie udało się odmontować CD-ROM-u w %s, być może wciąż jest używany."
 
-#: methods/cdrom.cc:251
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Nie odnaleziono dysku."
 
-#: methods/cdrom.cc:259 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Nie odnaleziono pliku"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Nieprawidłowe URI, lokalne URI nie mogą zaczynać się od //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:169
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Logowanie się"
 
-#: methods/ftp.cc:175
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Nie można określić nazwy zdalnego systemu"
 
-#: methods/ftp.cc:180
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Nie udało się określić nazwy lokalnego systemu"
 
-#: methods/ftp.cc:211 methods/ftp.cc:239
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Serwer odrzucił połączenie, otrzymana odpowiedź: %s"
 
-#: methods/ftp.cc:217
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Polecenie USER nie powiodło się, odpowiedź serwera: %s"
 
-#: methods/ftp.cc:224
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Polecenie PASS nie powiodło się, odpowiedź serwera: %s"
 
-#: methods/ftp.cc:244
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2063,201 +2075,201 @@ msgstr ""
 "Określono serwer pośredniczący, ale nie określono skryptu rejestrowania, "
 "Acquire::ftp::ProxyLogin jest puste."
 
-#: methods/ftp.cc:272
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 "Polecenie skryptu rejestrowania \"%s\" nie powiodło się, odpowiedź serwera: "
 "%s"
 
-#: methods/ftp.cc:298
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Polecenie TYPE nie powiodło się, odpowiedź serwera: %s"
 
-#: methods/ftp.cc:336 methods/ftp.cc:447 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Przekroczenie czasu połączenia"
 
-#: methods/ftp.cc:342
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Serwer zamknął połączenie"
 
-#: methods/ftp.cc:345 apt-pkg/contrib/fileutl.cc:831 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Błąd odczytu"
 
-#: methods/ftp.cc:352 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Odpowiedź przepełniła bufor."
 
-#: methods/ftp.cc:369 methods/ftp.cc:381
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Naruszenie zasad protokołu"
 
-#: methods/ftp.cc:453 apt-pkg/contrib/fileutl.cc:873 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Błąd zapisu"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Nie udało się utworzyć gniazda"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "Nie udało się połączyć gniazda danych, przekroczenie czasu połączenia"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Nie udało się połączyć pasywnego gniazda."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo nie było w stanie uzyskać nasłuchującego gniazda"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Nie udało się przyłączyć gniazda"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Nie udało się nasłuchiwać na gnieździe"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Nie udało się określić nazwy gniazda"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Nie można wysłać polecenia PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Nieznana rodzina adresów %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Polecenie EPRT nie powiodło się, odpowiedź serwera: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Przekroczony czas połączenia gniazda danych"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Nie udało się przyjąć połączenia"
 
-#: methods/ftp.cc:870 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Nie udało się obliczyć skrótu pliku"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nie można pobrać pliku, odpowiedź serwera: %s"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Przekroczony czas oczekiwania na dane"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Nie udało się przesłać danych, odpowiedź serwera: %s"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Info"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Nie można wywołać "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Łączenie z %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, 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:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Łączenie z %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nie udało się przetłumaczyć nazwy \"%s\""
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Tymczasowy błąd przy tłumaczeniu \"%s\""
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, 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:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nie udało się połączyć z %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Nieznany błąd podczas uruchamiania gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Następujące podpisy były błędne:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2265,106 +2277,111 @@ msgstr ""
 "Następujące podpisy nie mogły zostać zweryfikowane z powodu braku klucza "
 "publicznego:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Oczekiwanie na nagłówki"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Otrzymano pojedynczą linię nagłówka o długości ponad %u znaków"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Nieprawidłowa linia nagłówka"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek odpowiedzi"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Length"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Range"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Nieznany format daty"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Operacja select nie powiodła się"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Przekroczenie czasu połączenia"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Błąd przy pisaniu do pliku wyjściowego"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Błąd przy pisaniu do pliku"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Błąd przy pisaniu do pliku"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Błąd czytania z serwera"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Nie udało się uciąć zawartości pliku %s"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Błędne dane nagłówka"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Połączenie nie powiodło się"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Nie można wykonać mmap na pustym pliku"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Nie udało się zduplikować deskryptora pliku %i"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Nie udało się wykonać mmap %lu bajtów"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "Nie udało się zamknąć mmap"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "Nie udało się zsynchronizować mmap"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Nie udało się wykonać mmap %lu bajtów"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Nie udało się uciąć zawartości pliku %s"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2373,7 +2390,7 @@ msgstr ""
 "Brak miejsca dla dynamicznego MMap. Proszę zwiększyć rozmiar APT::Cache-"
 "Limit. Aktualna wartość: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2382,7 +2399,7 @@ msgstr ""
 "Nie udało się zwiększyć rozmiaru MMap, ponieważ limit %lu bajtów został już "
 "osiągnięty."
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2413,179 +2430,179 @@ msgstr "%limin %lis"
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1137
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Nie odnaleziono wyboru %s"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Nierozpoznany skrót typu: \"%c\""
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Otwieranie pliku konfiguracyjnego %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Błąd składniowy %s:%u: Blok nie zaczyna się nazwą."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Błąd składniowy %s:%u: Błędny znacznik"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Błąd składniowy %s:%u: Po wartości występują śmieci"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Błąd składniowy %s:%u: Dyrektywy mogą występować tylko na najwyższym poziomie"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Błąd składniowy %s:%u: Zbyt wiele zagnieżdżonych operacji include"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Błąd składniowy %s:%u: Włączony tutaj"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Błąd składniowy %s:%u: Nieobsługiwana dyrektywa \"%s\""
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Błąd składniowy %s:%u: czysta dyrektywa wymaga drzewa opcji jako argumentu"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Błąd składniowy %s:%u: Śmieci na końcu pliku"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Błąd!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Gotowe"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Opcja linii poleceń \"%c\" [z %s] jest nieznana."
 
-#: apt-pkg/contrib/cmndline.cc:101 apt-pkg/contrib/cmndline.cc:109
-#: apt-pkg/contrib/cmndline.cc:117
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Niezrozumiała opcja linii poleceń %s"
 
-#: apt-pkg/contrib/cmndline.cc:122
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Opcja linii poleceń %s nie jest typu logicznego"
 
-#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Opcja %s wymaga argumentu."
 
-#: apt-pkg/contrib/cmndline.cc:197 apt-pkg/contrib/cmndline.cc:203
+#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Opcja %s: Specyfikacja elementu konfiguracji musi zawierać =<wartość>."
 
-#: apt-pkg/contrib/cmndline.cc:232
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Opcja %s wymaga argumentu typu całkowitego, nie \"%s\""
 
-#: apt-pkg/contrib/cmndline.cc:263
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Opcja \"%s\" jest zbyt długa"
 
-#: apt-pkg/contrib/cmndline.cc:295
+#: apt-pkg/contrib/cmndline.cc:298
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr "Znaczenie %s jest nieznane, proszę spróbować true lub false."
 
-#: apt-pkg/contrib/cmndline.cc:345
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Nieprawidłowa operacja %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Nie udało się wykonać operacji stat na punkcie montowania %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:460 apt-pkg/acquire.cc:485 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nie udało się przejść do %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Nie udało się wykonać operacji stat na CDROM-ie"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nie udało się otworzyć pliku blokady %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nie udało się uzyskać blokady %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, 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:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, 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:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, 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:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2593,261 +2610,274 @@ msgstr ""
 "Ignorowanie pliku \"%s\" w katalogu \"%s\", ponieważ ma on nieprawidłowe "
 "rozszerzenie pliku"
 
-#: apt-pkg/contrib/fileutl.cc:690
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Oczekiwano na proces %s, ale nie było go"
 
-#: apt-pkg/contrib/fileutl.cc:702
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Podproces %s spowodował naruszenie ochrony pamięci."
 
-#: apt-pkg/contrib/fileutl.cc:704
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Podproces %s otrzymał sygnał %u."
 
-#: apt-pkg/contrib/fileutl.cc:708
+#: apt-pkg/contrib/fileutl.cc:737
 #, 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:710
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Podproces %s zakończył się niespodziewanie"
 
-#: apt-pkg/contrib/fileutl.cc:775 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nie udało się otworzyć pliku %s"
 
-#: apt-pkg/contrib/fileutl.cc:792
+#: apt-pkg/contrib/fileutl.cc:923
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nie udało się otworzyć deskryptora pliku %d"
 
-#: apt-pkg/contrib/fileutl.cc:852
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Nie udało się utworzyć IPC z podprocesem"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Nie udało się uruchomić kompresora "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "należało przeczytać jeszcze %lu, ale nic nie zostało"
 
-#: apt-pkg/contrib/fileutl.cc:885
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "należało zapisać jeszcze %lu, ale nie udało się to"
 
-#: apt-pkg/contrib/fileutl.cc:1021
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problem przy zamykaniu pliku gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:1024
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem przy zamykaniu pliku %s"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1419
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem przy zapisywaniu pliku %s w %s"
 
-#: apt-pkg/contrib/fileutl.cc:1040
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem przy odlinkowywaniu pliku %s"
 
-#: apt-pkg/contrib/fileutl.cc:1053
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Problem przy zapisywaniu pliku na dysk"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Pusty magazyn podręczny pakietów"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Magazyn podręczny pakietów jest uszkodzony"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "Magazyn podręczny pakietów jest w niezgodnej wersji"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Magazyn podręczny pakietów jest uszkodzony"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Ta wersja APT nie obsługuje systemu wersji \"%s\""
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 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:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Wymaga"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Wymaga wstępnie"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Sugeruje"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Poleca"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "W konflikcie z"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Zastępuje"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Dezaktualizuje"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Narusza zależności"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "Rozszerza"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "ważny"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "wymagany"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "standardowy"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "opcjonalny"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "dodatkowy"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Budowanie drzewa zależności"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Kandydujące wersje"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Generowanie zależności"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Odczyt informacji o stanie"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Nie udało się otworzyć pliku stanu %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Nie udało się zapisać tymczasowego pliku stanu %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Nie udało się zanalizować pliku pakietu %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Nie udało się zanalizować pliku pakietu %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 "Nieprawidłowa linia %lu w liście źródeł %s ([opcja] nie dająca się sparsować)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([opcja] zbyt krótka)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie jest przypisane)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie ma klucza)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 "Nieprawidłowa linia %lu w liście źródeł %s ([%s] klucz %s nie ma wartości)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Nieprawidłowa linia %lu w liście źródeł %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Nieprawidłowa linia %lu w liście źródeł %s (dystrybucja)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Nieprawidłowa linia %lu w liście źródeł %s (bezwzględna dystrybucja)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza dystrybucji)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Otwieranie %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 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:281
+#: apt-pkg/sourcelist.cc:285
 #, 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:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:645
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2857,7 +2887,12 @@ msgstr ""
 "5 apt.conf\" i zapoznać się z wpisem APT::Immediate-Configure aby dowiedzieć "
 "się więcej. (%d)"
 
-#: apt-pkg/packagemanager.cc:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Nie udało się otworzyć pliku \"%s\""
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2869,22 +2904,12 @@ msgstr ""
 "rozwiązanie, ale jeśli jest się pewnym swoich działań, należy włączyć opcję "
 "APT::Force-LoopBreak."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"Nie udało się wykonać natychmiastowej konfiguracji rozpakowanego pakietu %s. "
-"Proszę wykonać \"man 5 apt.conf\" i zapoznać się z wpisem APT::Immediate-"
-"Configure aby dowiedzieć się więcej."
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2892,7 +2917,7 @@ msgstr ""
 "Pakiet %s ma zostać ponownie zainstalowany, ale nie można znaleźć jego "
 "archiwum."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2900,11 +2925,11 @@ msgstr ""
 "Błąd, pkgProblemResolver::Resolve zwrócił błąd, może to być spowodowane "
 "zatrzymanymi pakietami."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 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:1471 apt-pkg/algorithms.cc:1473
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2912,79 +2937,79 @@ 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:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Brakuje katalogu list %spartial."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Brakuje katalogu archiwów %spartial."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "Nie udało się zablokować katalogu %s"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:861
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Pobieranie pliku %li z %li (pozostało %s)"
 
-#: apt-pkg/acquire.cc:863
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Pobieranie pliku %li z %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Nie udało się odnaleźć sterownika metody %s."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Metoda %s nie uruchomiła się poprawnie"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:146
+#: 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:162
+#: 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"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Nie udało się wykonać operacji stat na pliku %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Należy dopisać jakieś URI pakietów źródłowych do pliku sources.list"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Nie udało się otworzyć lub zanalizować zawartości list pakietów."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Należy uruchomić apt-get update aby naprawić te problemy."
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Nie udało się odczytać list źródeł."
 
-#: apt-pkg/policy.cc:72
+#: apt-pkg/policy.cc:74
 #, c-format
 msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
@@ -2993,125 +3018,87 @@ msgstr ""
 "Wartość %s jest nieprawidłowa dla APT::Default-Release, ponieważ takie "
 "wydanie nie jest dostępne w źródłach"
 
-#: apt-pkg/policy.cc:390
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Nieprawidłowe informacje w pliku ustawień %s, brak nagłówka Package"
 
-#: apt-pkg/policy.cc:412
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Nierozpoznany typ przypinania %s"
 
-#: apt-pkg/policy.cc:420
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Brak (lub zerowy) priorytet przypięcia"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Magazyn podręczny ma niezgodny system wersji"
 
-#: apt-pkg/pkgcachegen.cc:190
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Wystąpił błąd podczas przetwarzania %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:207
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Wystąpił błąd podczas przetwarzania %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:245
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Wystąpił błąd podczas przetwarzania %s (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:277
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Wystąpił błąd podczas przetwarzania %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:281
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Wystąpił błąd podczas przetwarzania %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:298 apt-pkg/pkgcachegen.cc:308
-#: apt-pkg/pkgcachegen.cc:316
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Wystąpił błąd podczas przetwarzania %s (NewVersion%d)"
-
-#: apt-pkg/pkgcachegen.cc:312
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Wystąpił błąd podczas przetwarzania %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:345
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Wystąpił błąd podczas przetwarzania %s (NewFileDesc2)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Wystąpił błąd podczas przetwarzania %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Przekroczono liczbę pakietów, którą ten APT jest w stanie obsłużyć."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Przekroczono liczbę wersji, którą ten APT jest w stanie obsłużyć."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Przekroczono liczbę opisów, którą ten APT jest w stanie obsłużyć."
 
-#: apt-pkg/pkgcachegen.cc:360
+#: apt-pkg/pkgcachegen.cc:243
 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:389
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Wystąpił błąd podczas przetwarzania %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:403
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Wystąpił błąd podczas przetwarzania %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:975
+#: apt-pkg/pkgcachegen.cc:1082
 #, 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:1080
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Zbieranie zapewnień plików"
 
-#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1281
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "nie udało się zmienić nazwy, %s (%s -> %s)"
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "Błędna suma MD5"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1847
-#: apt-pkg/acquire-item.cc:1990
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Błędna suma kontrolna"
 
-#: apt-pkg/acquire-item.cc:1387
+#: apt-pkg/acquire-item.cc:1399
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3120,16 +3107,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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1438
+#: apt-pkg/acquire-item.cc:1450
 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:1476
+#: apt-pkg/acquire-item.cc:1488
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3138,12 +3125,12 @@ msgstr ""
 "Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego "
 "repozytorium nie będą wykonywane."
 
-#: apt-pkg/acquire-item.cc:1498
+#: apt-pkg/acquire-item.cc:1510
 #, 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:1531
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3153,12 +3140,12 @@ msgstr ""
 "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:1541 apt-pkg/acquire-item.cc:1546
+#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Błąd GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1638
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3167,7 +3154,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:1697
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3176,48 +3163,48 @@ 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:1752
+#: apt-pkg/acquire-item.cc:1768
 #, 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:1839
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Błędny rozmiar"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Nie udało się przeanalizować pliku Release %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Brak sekcji w pliku Release %s"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Brak wpisu Hash w pliku Release %s"
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, 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:129
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Nieprawidłowy wpis Date w pliku Release %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Blok producenta %s nie zawiera odcisku"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3226,41 +3213,41 @@ msgstr ""
 "Użycie %s jako punktu montowania CD-ROM-u\n"
 "Montowanie CD-ROM-u\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Identyfikacja.. "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Etykieta: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "Odmontowanie CD-ROM-u...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Użycie %s jako punktu montowania CD-ROM-u\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Odmontowanie CD-ROM-u\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Oczekiwanie na płytę...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Montowanie CD-ROM-u...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Skanowanie płyty w poszukiwaniu plików indeksu..\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3269,7 +3256,7 @@ msgstr ""
 "Znaleziono %zu indeksów pakietów, %zu indeksów źródłowych, %zu indeksów "
 "tłumaczeń i %zu podpisów\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3277,16 +3264,16 @@ msgstr ""
 "Nie można odnaleźć żadnych plików pakietów, być może nie jest to dysk "
 "Debiana lub jest to inna architektura?"
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Znaleziono etykietę \"%s\"\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "To nie jest prawidłowa nazwa, proszę spróbować ponownie.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3295,93 +3282,93 @@ msgstr ""
 "Płyta nosi nazwę: \n"
 "\"%s\"\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Kopiowanie list pakietów..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Zapisywanie nowej listy źródeł\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "Źródła dla tej płyty to:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:927
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Zapisano %i rekordów.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:929
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, 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:275 apt-pkg/indexcopy.cc:932
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:935
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, 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"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Pomijanie nieistniejącego pliku %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Nie udało się znaleźć wpisu uwierzytelnienia dla: %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Błędna suma kontrolna dla: %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "Brak zainstalowanej bazy kluczy w %s."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Nie udało się odnaleźć zadania \"%s\""
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 "Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Nie udało się wybrać wersji z pakietu \"%s\", ponieważ jest on czysto "
 "wirtualny"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3390,128 +3377,152 @@ msgstr ""
 "Nie udało się wybrać zainstalowanej ani kandydującej wersji pakietu \"%s\", "
 "ponieważ nie ma żadnej z nich"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Nie udało się wybrać najnowszej wersji pakietu \"%s\", ponieważ jest on "
 "czysto wirtualny"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Nie udało się wybrać wersji kandydującej pakietu %s, ponieważ nie ma "
 "kandydata"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Nie udało się wybrać zainstalowanej wersji z pakietu %s, ponieważ nie jest "
 "zainstalowany"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "Instalowanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Konfigurowanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Usuwanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "Całkowite usuwanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Proszę odnotować zniknięcie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Brakuje katalogu \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Nie udało się otworzyć pliku \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Przygotowywanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozpakowywanie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Przygotowywanie do konfiguracji %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "Pakiet %s został zainstalowany"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Przygotowywanie do usunięcia %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "Pakiet %s został usunięty"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Przygotowywanie do całkowitego usunięcia %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "Pakiet %s został całkowicie usunięty"
 
-#: apt-pkg/deb/dpkgpm.cc:1087
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1118
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "Uruchamianie dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1344
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1349
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego"
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3519,7 +3530,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:1357
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3527,7 +3538,7 @@ msgstr ""
 "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
 "przepełnienie dysku"
 
-#: apt-pkg/deb/dpkgpm.cc:1363
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3535,14 +3546,14 @@ msgstr ""
 "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd "
 "braku wolnej pamięci"
 
-#: apt-pkg/deb/dpkgpm.cc:1370
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd "
 "wejścia/wyjścia dpkg"
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3552,7 +3563,7 @@ msgstr ""
 "używa?"
 
 # Musi pasować do su i sudo.
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
@@ -3561,37 +3572,37 @@ msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "dpkg został przerwany, należy wykonać ręcznie \"%s\", aby naprawić problem."
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Niezablokowany"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "Nie znaleziono pliku serwera lustrzanego \"%s\""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Nie udało się otworzyć pliku serwera lustrzanego \"%s\""
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Serwer lustrzany: %s]"
 
-#: methods/rred.cc:506
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3600,7 +3611,7 @@ msgstr ""
 "Nie udało się nałożyć łatki %s przy użyciu mmap i operacji plikowej - łatka "
 "wygląda na uszkodzoną."
 
-#: methods/rred.cc:511
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3609,10 +3620,69 @@ msgstr ""
 "Nie udało się nałożyć łatki %s przy użyciu mmap, ale błąd nie pochodzi z "
 "mmap - łatka wygląda na uszkodzoną"
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Połączenie zostało przedwcześnie zamknięte"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Uwaga: dpkg wykonał to automatycznie i celowo."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Nieprawidłowa linia %2$lu #1 pliku override %1$s"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Nieprawidłowa linia %2$lu #2 pliku override %1$s"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Nieprawidłowa linia %2$lu #3 pliku override %1$s"
+
+#~ msgid "decompressor"
+#~ msgstr "dekompresor"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "należało przeczytać jeszcze %lu, ale nic nie zostało"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "należało zapisać jeszcze %lu, ale nie udało się to"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "Nie udało się wykonać natychmiastowej konfiguracji rozpakowanego pakietu "
+#~ "%s. Proszę wykonać \"man 5 apt.conf\" i zapoznać się z wpisem APT::"
+#~ "Immediate-Configure aby dowiedzieć się więcej."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Błąd wewnętrzny, nie udało się odnaleźć składnika"
 
diff --git a/po/pt.po b/po/pt.po
index cfd2d3961..8da5c1fc1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+0200\n"
 "PO-Revision-Date: 2010-08-28 09:03+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -17,150 +17,151 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);X-Generator: Lokalize 1.0\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "O pacote %s versão %s tem uma dependência não satisfeita:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Total de nomes de pacotes: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Total de estruturas de pacotes: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Pacotes normais: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Pacotes virtuais puros: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Pacotes virtuais únicos: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Pacotes virtuais misturados: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Faltam: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Total de versões distintas: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Total de descrições distintas: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Total de dependências: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Total de relações ver/ficheiro: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Total de relações Desc/Ficheiro: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Total de Mapeamentos 'Provides': "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Total de strings globbed: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Espaço total de dependência de versão: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Espaço total desperdiçado: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Espaço total contabilizado: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "O ficheiro do pacote %s está dessincronizado."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Não foi encontrado nenhum pacote"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "Tem de fornecer pelo menos um padrão de busca"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Não foi possível encontrar o pacote %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Ficheiros de Pacotes :"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Pacotes Marcados:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(não encontrado)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Marcação do Pacote: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Tabela de Versão:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -236,29 +237,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:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 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:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Falhou ao montar '%s' para '%s'"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 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."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "os argumentos não estão em pares"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -287,12 +288,12 @@ msgstr ""
 "  -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s não é um pacote DEB válido."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -317,40 +318,40 @@ msgstr ""
 "  -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Não conseguiu escrever para %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Não pode obter a versão do debconf. O debconf está instalado?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "A lista de extensão de pacotes é demasiado longa"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Erro ao processar o directório %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Lista de extensão de códigos-fonte é demasiado longa"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Erro ao escrever o cabeçalho no ficheiro de conteúdo"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Erro ao processar o conteúdo %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -431,26 +432,26 @@ msgstr ""
 "   -c=?  Ler este ficheiro de configuração\n"
 "   -o=?  Definir uma opção de configuração arbitrária"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Nenhuma selecção coincidiu"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Faltam alguns ficheiros no grupo `%s' do ficheiro do pacote"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "A base de dados estava corrompida, ficheiro renomeado para %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "A base de dados é antiga, a tentar actualizar %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -458,111 +459,111 @@ msgstr ""
 "O formato da BD é inválido. Se actualizou a partir de uma versão antiga do "
 "apt, por favor remova-a e crie novamente a base de dados."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 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:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
-#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Falha stat %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "O arquivo não tem registo de controlo"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Não foi possível obter um cursor"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, 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:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Não foi possível fazer stat %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: Os erros aplicam-se ao ficheiro "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Falhou resolver %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Falhou ao percorrer a árvore"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Falhou abrir %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Falhou o readlink %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Falhou o unlink %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Falhou ligar %s a %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Limite DeLink de %sB atingido.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Arquivo não possuía campo package"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s não possui entrada override\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr " o maintainer de %s é %s, não %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s não possui fonte de entrada de 'override'\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s também não possui entrada binária de 'override'\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Falhou alocar memória"
 
@@ -572,18 +573,18 @@ msgid "Unable to open %s"
 msgstr "Não foi possível abrir %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Override %s malformado linha %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Override %s malformado linha %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Override %s malformado linha %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -591,63 +592,51 @@ msgstr "Override %s malformado linha %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "Falhou ler o ficheiro override %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Algoritmo de compressão desconhecido '%s'"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Saída compactada %s precisa de um conjunto de compressão"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Falha ao criar pipe IPC para subprocesso"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Falhou criar FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Falhou o fork"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Compactar filho"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Erro Interno, falhou criar %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Falhou criar subprocesso IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Falhou executar compactador "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "descompactador"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "Falhou o IO para subprocesso/arquivo"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Falhou ler durante o cálculo de MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Problema ao executar unlinking %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Falhou renomear %s para %s"
@@ -656,75 +645,79 @@ msgstr "Falhou renomear %s para %s"
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erro de compilação de regex - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "mas %s está instalado"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "mas %s está para ser instalado"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "mas não é instalável"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "mas é um pacote virtual"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "mas não está instalado"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "mas não vai ser instalado"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " ou"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Serão instalados os seguintes NOVOS pacotes:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Serão REMOVIDOS os seguintes pacotes:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Serão actualizados os seguintes pacotes:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Será feito o DOWNGRADE aos seguintes pacotes:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Os seguintes pacotes mantidos serão mudados:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (devido a %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -732,59 +725,59 @@ msgstr ""
 "AVISO: Os seguintes pacotes essenciais serão removidos.\n"
 "Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu a que foi feito o downgrade, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu a remover e %lu não actualizados.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Note, a seleccionar '%s' para a tarefa '%s'\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Note, a seleccionar '%s' para a expressão regular '%s'\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "O pacote %s é um pacote virtual disponibilizado por:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Instalado]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr "[Não é versão candidata]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Você deve seleccionar explicitamente um para instalar."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -795,149 +788,149 @@ msgstr ""
 "Isso pode significar que o pacote falta, ou ficou obsoleto, ou\n"
 "está disponível somente a partir de outra fonte\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "No entanto, os seguintes pacotes substituem-no:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "O pacote '%s' não tem candidato para instalação"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "Pacotes virtuais como '%s' não podem ser removidos\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Note, a seleccionar '%s' em vez de '%s'\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Saltando %s, já está instalado e a actualização não está definida.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "Saltando %s, não está instalado e só são pedidas actualizações.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "A reinstalação de %s não é possível, o download do mesmo não pode ser "
 "feito.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s já está na versão mais recente.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s está definido para ser instalado manualmente.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versão seleccionada '%s' (%s) para '%s'\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Versão seleccionada '%s' (%s) para '%s'\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "O pacote %s não está instalado, por isso não será removido\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "A corrigir dependências..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " falhou."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Não foi possível corrigir dependências"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Não foi possível minimizar o conjunto de actualizações"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Feito"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Você pode querer executar 'apt-get -f install' para corrigir isso."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependências não satisfeitas. Tente utilizar -f."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISO: Os seguintes pacotes não podem ser autenticados!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Aviso de autenticação ultrapassado.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Instalar estes pacotes sem verificação [y/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Alguns pacotes não puderam ser autenticados"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Há problemas e foi utilizado -y sem --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro Interno, Ordering não terminou"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Estranho.. Os tamanhos não coincidiram, escreva para apt@packages.debian.org"
 
 #. 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "É necessário obter %sB/%sB de arquivos.\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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "É necessário obter %sB de arquivos.\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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -945,31 +938,31 @@ 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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 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:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Não foi possível determinar o espaço livre em %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Você não possui espaço livre suficiente em %s."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Trivial Only especificado mas isto não é uma operação trivial."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Sim, faça como eu digo!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -980,28 +973,28 @@ msgstr ""
 "Para continuar escreva a frase '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Abortado."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Deseja continuar [Y/n]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falhou obter %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Falhou o download de alguns ficheiros"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Download completo e em modo de fazer apenas o download"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1009,19 +1002,19 @@ msgstr ""
 "Não foi possível obter alguns arquivos, tente talvez correr apt-get update "
 "ou tente com --fix-missing?"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing e troca de mídia não são suportados actualmente"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Não foi possível corrigir os pacotes em falta."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "A abortar a instalação."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1035,35 +1028,35 @@ msgstr[1] ""
 "Os seguintes pacotes desapareceram do seu sistema pois\n"
 "todos os ficheiros foram  por outros pacotes:"
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Nota: Isto foi feito automaticamente e intencionalmente pelo dpkg."
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Ignorar o lançamento pretendido, não disponível, '%s' do pacote '%s'"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "A escolher '%s' como pacote pacote de código fonte em vez de '%s'\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Ignorar a versão '%s', não disponível, do pacote '%s'"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "O comando update não leva argumentos"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Não é suposto nós apagarmos coisas, não pode iniciar o AutoRemover"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1081,15 +1074,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "A seguinte informação pode ajudar a resolver a situação:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Erro Interno, o AutoRemover estragou coisas"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1101,7 +1094,7 @@ msgstr[1] ""
 "Os seguintes pacotes foram instalados automaticamente e já não são "
 "necessários:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1110,19 +1103,19 @@ msgstr[0] "O pacote %lu foi instalado automaticamente e já não é necessário.
 msgstr[1] ""
 "Os pacotes %lu foram instalados automaticamente e já não são necessários.\n"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Utilize 'apt-get autoremove' para os remover."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erro Interno, AllUpgrade estragou algo"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Você deve querer executar 'apt-get -f install' para corrigir estes:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1130,7 +1123,7 @@ msgstr ""
 "Dependências não satisfeitas. Tente 'apt-get -f install' sem nenhum pacote "
 "(ou especifique uma solução)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1142,73 +1135,73 @@ msgstr ""
 "distribuição unstable em que alguns pacotes pedidos ainda não foram \n"
 "criados ou foram movidos do Incoming."
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Pacotes estragados"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Os seguintes pacotes extra serão instalados:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Pacotes sugeridos:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Pacotes recomendados:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossível encontrar o pacote %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s está definido para ser instalado automaticamente.\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "A calcular a actualização... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Falhou"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Pronto"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro Interno, o solucionador de problemas estragou coisas"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Impossível criar acesso exclusivo ao directório de downloads"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 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:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, 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:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1218,7 +1211,7 @@ msgstr ""
 "'%s' em:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1229,89 +1222,89 @@ msgstr ""
 "bzr get %s\n"
 "para obter as últimas actualizações (possivelmente por lançar) ao pacote.\n"
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, 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:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, 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:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter código fonte %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Falhou obter alguns arquivos."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "O comando de descompactação '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, 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:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "O comando de compilação '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "O processo filho falhou"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 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:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, 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:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s não tem dependências de compilação.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1320,7 +1313,7 @@ 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:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1329,14 +1322,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:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1345,7 +1338,7 @@ msgstr ""
 "a dependência de %s para %s não pode ser satisfeita porque nenhuma versão "
 "disponível do pacote %s pode satisfazer os requisitos de versão"
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1354,30 +1347,30 @@ 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:2980
+#: cmdline/apt-get.cc:3015
 #, 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:2996
+#: cmdline/apt-get.cc:3031
 #, 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:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Falhou processar as dependências de compilação"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "A Ligar a %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Módulos Suportados:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1468,7 +1461,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:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1480,33 +1473,33 @@ msgstr ""
 "\tTenha em mente que o acesso exclusivo está desabilitado,\n"
 "\tpor isso não confie na relevância da real situação actual!"
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Hit "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Obter:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ign "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Err "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Obtidos %sB em %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [A trabalhar]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1517,46 +1510,62 @@ msgstr ""
 " '%s'\n"
 "no leitor '%s' e pressione enter\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "mas não está instalado"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s está definido para ser instalado manualmente.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s está definido para ser instalado automaticamente.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s já está na versão mais recente.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s já está na versão mais recente.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s está definido para ser instalado manualmente.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Falhou abrir %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1578,11 +1587,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Registo de pacote desconhecido!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1647,197 +1656,199 @@ msgstr ""
 msgid "Merging available information"
 msgstr "A juntar a informação disponível"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Falhou a criação de pipes"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Falhou executar gzip "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Arquivo corrompido"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "A soma de controlo do tar falhou, arquivo corrompido"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Assinatura de arquivo inválida"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Erro na leitura de cabeçalho membro de arquivo"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "Cabeçalho membro de arquivo inválido %s"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Cabeçalho membro de arquivo inválido"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Arquivo é demasiado pequeno"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Falha ao ler os cabeçalhos do arquivo"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "DropNode chamado em nó ainda linkado"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Falha ao localizar o elemento de hash!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Falha ao alocar desvio (diversion)"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Erro Interno em AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "A tentar sobrescrever um desvio, %s -> %s e %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Adição dupla de desvio %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Arquivo de configuração duplicado %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Falhou escrever o ficheiro %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Falhou fechar o ficheiro %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "O caminho %s é demasiado longo"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "A descompactar %s mais de uma vez"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "O directório %s é desviado"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "O caminho de desvio é muito longo"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "Falhou localizar o nó no seu hash bucket"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "O caminho é demasiado longo"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, 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:429
+#: apt-inst/extract.cc:432
 #, 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"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Não foi possível ler %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Não foi possível fazer stat %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Falhou remover %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Não foi capaz de criar %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Falhou stat %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "Os directórios info e temp precisam estar no mesmo sistema de ficheiros"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "A ler as listas de pacotes"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Falhou mudar para o directório administrativo %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Erro Interno ao obter um nome de pacote"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "A ler a listagem de ficheiros"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1848,113 +1859,114 @@ msgstr ""
 "este ficheiro, crie outro vazio e reinstale imediatamente a a mesma versão "
 "do pacote!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Falhou ler o ficheiro de lista %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Erro interno ao obter um nó"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Falhou abrir o ficheiro de desvios %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "O ficheiro de desvios está corrompido"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Linha inválida no ficheiro de desvio: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Erro interno ao adicionar um desvio"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "A cache de pacotes tem de ser inicializada primeiro"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Falhou encontrar um Pacote: cabeçalho, posição %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Secção ConfFile errada no ficheiro de estado. Offset %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Erro ao fazer parse ao MD5. Offset %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Este não é um arquivo DEB válido, falta o membro '%s'"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 "Este não é um arquivo DEB válido, não tem '%s', '%s' ou o membro '%s'"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Não foi possível mudar para %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Erro Interno, não foi possível localizar o membro %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Falha em localizar um ficheiro de controle válido"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Ficheiro de controle não interpretável"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Não foi possível abrir pipe para %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Erro de leitura do processo %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Falhou o stat"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Falhou definir hora de modificação"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Não foi capaz de ler a base de dados de cdrom %s"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1962,56 +1974,56 @@ msgstr ""
 "Por favor utilize o apt-cdrom para fazer com que este CD seja reconhecido "
 "pelo APT. apt-get update não pode ser utilizado para adicionar novos CDs"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "CD errado"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Impossível desmontar o CD-ROM em %s, pode ainda estar a ser utilizado."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Disco não encontrado."
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Ficheiro não encontrado"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI inválido, URIs locais não devem começar por //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "A identificar-se no sistema"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Não foi possível determinar o nome do posto"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Não foi possível determinar o nome local"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "O servidor recusou a ligação e respondeu: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER falhou, o servidor respondeu: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS falhou, o servidor respondeu: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2019,200 +2031,200 @@ msgstr ""
 "Foi especificado um servidor de proxy mas não um script de login, Acquire::"
 "ftp::ProxyLogin está vazio."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "O comando de script de login '%s' falhou, o servidor respondeu: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE falhou, o servidor respondeu: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Foi atingido o tempo limite de ligação"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "O servidor fechou a ligação"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Erro de leitura"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Uma resposta sobrecarregou o buffer."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Corrupção de protocolo"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Erro de escrita"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Não foi possível criar um socket"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "Não foi possível ligar socket de dados, a ligação expirou"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Não foi possível ligar socket passivo."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo não foi capaz de obter um socket de escuta"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Não foi possível fazer o bind a um socket"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Não foi possível executar listen no socket"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Não foi possível determinar o nome do socket"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Não foi possível enviar o comando PORT"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Família de endereços %u desconhecida (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT falhou, o servidor respondeu: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Ligação de socket de dados expirou"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Impossível aceitar ligação"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Problema ao calcular o hash do ficheiro"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Não foi possível obter o ficheiro, o servidor respondeu '%s'"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Expirou o tempo do socket de dados"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "A transferência de dados falhou, o servidor respondeu '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Pesquisa"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Não foi possível invocar "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "A Ligar a %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, 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:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "A ligar a %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Não foi possível resolver '%s'"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Falha temporária a resolver '%s'"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Não foi possível ligar a %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Pelo menos uma assinatura inválida foi encontrada."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Erro desconhecido ao executar gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes assinaturas eram inválidas:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2220,106 +2232,111 @@ msgstr ""
 "As seguintes assinaturas não puderam ser verificadas porque a chave pública "
 "não está disponível:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "A aguardar por cabeçalhos"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Linha de cabeçalho errada"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "O servidor HTTP enviou um cabeçalho Content-Length inválido"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "O servidor HTTP enviou um cabeçalho Content-Range inválido"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Este servidor HTTP possui suporte de range errado"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Formato de data desconhecido"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "A selecção falhou"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "O tempo da ligação expirou"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Erro ao escrever para o ficheiro de saída"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Erro ao escrever para ficheiro"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Erro ao escrever para o ficheiro"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 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:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Erro ao ler do servidor"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Falhou truncar o ficheiro"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Dados de cabeçalho errados"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "A ligação falhou"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Não é possível fazer mmap a um ficheiro vazio"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Não foi possível duplicar o descritor de ficheiro %i"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Não foi possível fazer mmap de %lu bytes"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "Não foi possível fechar mmap"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "Não foi sincronizar mmap "
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Não foi possível fazer mmap de %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Falhou truncar o ficheiro"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2328,7 +2345,7 @@ msgstr ""
 "O Dynamic MMap ficou sem espaço. Por favor aumente o tamanho de APT::Cache-"
 "Limit. Valor actual: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2337,7 +2354,7 @@ msgstr ""
 "Não foi possível aumentar o tamanho do MMap pois o limite de %lu bytes já "
 "foi alcançado."
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2368,96 +2385,96 @@ msgstr "%limin %lis"
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "A selecção %s não foi encontrada"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Abreviatura de tipo desconhecida: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "A abrir o ficheiro de configuração %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Erro de sintaxe %s:%u: O bloco começa sem nome."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Erro de sintaxe %s:%u: Tag mal formada"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Erro de sintaxe %s:%u: Directivas só podem ser feitas no nível mais alto"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Erro de sintaxe %s:%u: Demasiados includes encadeados"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Erro de sintaxe %s:%u: Directiva '%s' não suportada"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Erro de sintaxe %s:%u: directiva clara necessita de uma árvore de opções "
 "como argumento"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Erro de sintaxe %s:%u: Lixo extra no final do ficheiro"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Erro !"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Pronto"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Opção '%c' da linha de comandos [de %s] é desconhecida."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Opção %s de linha de comandos não é compreendida"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Opção %s da linha de comandos não é booleana"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "A opção %s necessita de um argumento."
@@ -2467,342 +2484,355 @@ msgstr "A opção %s necessita de um argumento."
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Opção %s: Especificação de item de configuração tem de ter um =<val>."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Opção %s necessita de um número inteiro como argumento, não '%s'"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Opção '%s' é demasiado longa"
 
-#: 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 "O sentido %s não é compreendido, tente verdadeiro ou falso."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Operação %s inválida"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Impossível executar stat ao ponto de montagem %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Impossível mudar para %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Impossível executar stat ao cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, 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:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Não foi possível obter acesso exclusivo a %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperou por %s mas não estava lá"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, 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:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "O sub-processo %s recebeu o sinal %u."
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, 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:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "O sub-processo %s terminou inesperadamente"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Não foi possível abrir ficheiro o %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, 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:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Falhou criar subprocesso IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Falhou executar compactador "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "lido, ainda restam %lu para serem lidos mas não resta nenhum"
 
-#: apt-pkg/contrib/fileutl.cc:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "escrito, ainda restam %lu para escrever mas não foi possível"
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problema ao fechar o ficheiro gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problema ao fechar o ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problema ao renomear o ficheiro %s para %s"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problema ao remover o link do ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Problema sincronizando o ficheiro"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Cache de pacotes vazia"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "O ficheiro de cache de pacotes está corrompido"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "O ficheiro de cache de pacotes é de uma versão incompatível"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "O ficheiro de cache de pacotes está corrompido"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Este APT não suporta o sistema de versões '%s'"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 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:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Pré-Depende"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Sugere"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Recomenda"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Em Conflito"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Substitui"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Obsoleta"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Estraga"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "Aumenta"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "necessário"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "padrão"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "A construir árvore de dependências"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Versões candidatas"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Geração de dependências"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "A ler a informação de estado"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Falhou abrir o StateFile %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Falha escrever ficheiro temporário StateFile %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 "Linha mal formada %lu na lista de fontes %s ([opção] não interpretável)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Linha mal formada %lu na lista de fontes %s ([opção] demasiado curta)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 "Linha mal formada %lu na lista de fontes %s ([%s] não é uma atribuição)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Linha mal formada %lu na lista de fontes %s ([%s] não tem chave)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 "Linha mal formada %lu na lista de fontes %s ([%s] chave %s não tem valor)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Linha mal formada %lu na lista de fontes %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Linha mal formada %lu na lista de fontes %s (distribuição)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Linha mal formada %lu na lista de fontes %s (distribuição absoluta)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Linha mal formada %lu na lista de fontes %s (dist parse)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "A abrir %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Linha %u é demasiado longa na lista de fontes %s."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, 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:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2811,7 +2841,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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Não foi possível abrir ficheiro o '%s'"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2823,21 +2858,12 @@ msgstr ""
 "normalmente é mau, mas se você quer realmente fazer isso, active a opção "
 "APT::Force-LoopBreak."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"Não foi possível proceder à configuração imediata no já descompactado '%s'. "
-"Para mais detalhes por favor veja man 5 apt.conf em APT::Immediate-Configure."
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Tipo do ficheiro de índice '%s' não é suportado"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2845,7 +2871,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:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2853,13 +2879,13 @@ msgstr ""
 "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
 "pacotes mantidos (hold)."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 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:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2868,243 +2894,205 @@ msgstr ""
 "Falhou o download de alguns ficheiros de índice, foram ignorados ou os "
 "antigos foram usados em seu lugar."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Falta directório de listas %spartial."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Falta o directório de arquivos %spartial."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "Impossível criar acesso exclusivo ao directório %s"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "A obter o ficheiro %li de %li (%s restantes)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "A obter o ficheiro %li de %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "O driver do método %s não pôde ser encontrado."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Método %s não iniciou correctamente"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: 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:163
+#: 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"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Não foi possível fazer stat %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Você deve colocar alguns URIs 'source' no seu sources.list"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "As listas de pacotes ou o ficheiro de status não pôde ser analisado ou "
 "aberto."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Você terá que executar apt-get update para corrigir estes problemas"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "A lista de fontes não pôde ser lida."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Registo inválido no ficheiro de preferências %s, sem cabeçalho Package"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Não foi possível entender o tipo de marca (pin) %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Nenhuma prioridade (ou zero) especificada para marcação (pin)"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "A cache possui um sistema de versões incompatível"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Ocorreu um erro ao processar %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Ocorreu um erro ao processar %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Ocorreu um erro ao processar %s (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Ocorreu um erro ao processar %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Ocorreu um erro ao processar %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Ocorreu um erro ao processar %s (NewVersion%d)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Ocorreu um erro ao processar %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Ocorreu um erro ao processar %s (NewFileDesc2)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Ocorreu um erro ao processar %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de nomes de pacotes que este APT é capaz de "
 "suportar."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de versões que este APT é capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de descrições que este APT é capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 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:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Ocorreu um erro ao processar %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Ocorreu um erro ao processar %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, 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:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "A obter File Provides"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "Erro de I/O ao gravar a cache de código fonte"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "falhou renomear, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum não coincide"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Código de verificação hash não coincide"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Não foi possível fazer parse ao ficheiro Release %s"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1450
 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:1488
 #, 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:1510
 #, 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:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3115,12 +3103,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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Erro GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3130,7 +3118,7 @@ msgstr ""
 "significar que você precisa corrigir manualmente este pacote. (devido a "
 "arquitectura em falta)"
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3139,7 +3127,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:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3147,41 +3135,41 @@ msgstr ""
 "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
 "para o pacote %s."
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Tamanho incorrecto"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, 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:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Nenhuma secção, no ficheiro Release %s"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Nenhuma entrada hash no ficheiro Release %s"
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, 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:125
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Entrada, 'Date', inválida no ficheiro Release %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "O bloco de fabricante %s não contém a impressão digital"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3190,41 +3178,41 @@ msgstr ""
 "Utilizando o ponto de montagem do CD-ROM %s\n"
 "A montar o CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "A identificar.. "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Label Guardada: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "A desmontar o CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "A utilizar o ponto de montagem do CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "A desmontar o CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "A aguardar pelo disco...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "A montar o CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "A pesquisar os ficheiros de índice do disco..\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3233,7 +3221,7 @@ msgstr ""
 "Foram encontrados %zu índices de pacotes, %zu índices de código-fonte, %zu "
 "índices de tradução e %zu assinaturas\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3241,16 +3229,16 @@ msgstr ""
 "Não foi possível localizar quaisquer ficheiros de pacote, talvez este não "
 "seja um disco Debian ou seja a arquitectura errada?"
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Encontrada a etiqueta '%s'\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Isso não é um nome válido, tente novamente.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3259,93 +3247,93 @@ msgstr ""
 "Este disco tem o nome: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "A copiar listas de pacotes..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "A escrever lista de novas source\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 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:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Escreveu %i registos.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, 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:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Escreveu %i registos com %i ficheiros em falta e %i ficheiros não "
 "coincidentes\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "A saltar ficheiro %s inexistente"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Não foi possível encontrar registo de autenticação para: %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash não coincide para: %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "Nenhum keyring instalado em %s."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Não foi encontrado o Release '%s' para '%s'"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Não foi encontrada a versão '%s' para '%s'"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Não foi possível encontrar a tarefa '%s'"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Não foi possível seleccionar versões do pacote '%s' pois é puramente virtual"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3354,128 +3342,152 @@ msgstr ""
 "Não pode seleccionar a versão instalada nem a versão candidata do pacote "
 "'%s' pois não tem nenhuma destas"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Não foi possível seleccionar a versão mais recente a partir do pacote '%s' "
 "já que é puramente virtual"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Não é possível seleccionar a versão candidata do pacote %s já que não tem "
 "candidato"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Não é possível seleccionar a versão instalada do pacote %s pois não está "
 "instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "A instalar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "A configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "A remover %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "A remover completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "A notar o desaparecimento de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta o directório '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Não foi possível abrir ficheiro o '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "A preparar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "A desempacotar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "A preparar para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "A preparar a remoção de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "%s removido"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "A preparar para remover completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "Remoção completa de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "A correr o dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas de dependências - deixando por configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3483,7 +3495,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:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3491,7 +3503,7 @@ msgstr ""
 "Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
 "cheio"
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3499,14 +3511,14 @@ msgstr ""
 "Nenhum relatório apport escrito pois a mensagem de erro indica um erro de "
 "memória esgotada"
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Nenhum relatório apport escrito pois a mensagem de erro indica um erro de I/"
 "O do dpkg"
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3515,7 +3527,7 @@ msgstr ""
 "Não foi possível obter acesso exclusivo ao directório de administração (%s), "
 "outro processo está a utilizá-lo?"
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
@@ -3524,7 +3536,7 @@ msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3532,30 +3544,30 @@ msgstr ""
 "O dpkg foi interrompido, para corrigir o problema tem de correr manualmente "
 "'%s'"
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Sem acesso exclusivo"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "Não foi encontrado ficheiro de mirror '%s'"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Não foi encontrado ficheiro de mirror '%s'"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Mirror: %s]"
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3564,7 +3576,7 @@ msgstr ""
 "Não foi possível aplicar o patch %s com mmap e com a utilização de operação "
 "de ficheiro - o patch parece estar corrompido."
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3573,10 +3585,69 @@ msgstr ""
 "Não foi possível aplicar o patch %s com mmap (mas não é uma falha especifica "
 "do mmap) - o patch parece corrompido."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Ligação encerrada prematuramente"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Nota: Isto foi feito automaticamente e intencionalmente pelo dpkg."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Override %s malformado linha %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Override %s malformado linha %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Override %s malformado linha %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "descompactador"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "lido, ainda restam %lu para serem lidos mas não resta nenhum"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "escrito, ainda restam %lu para escrever mas não foi possível"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "Não foi possível proceder à configuração imediata no já descompactado "
+#~ "'%s'. Para mais detalhes por favor veja man 5 apt.conf em APT::Immediate-"
+#~ "Configure."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Ocorreu um erro ao processar %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Ocorreu um erro ao processar %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Ocorreu um erro ao processar %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Ocorreu um erro ao processar %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Ocorreu um erro ao processar %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Ocorreu um erro ao processar %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Ocorreu um erro ao processar %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Ocorreu um erro ao processar %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Ocorreu um erro ao processar %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Ocorreu um erro ao processar %s (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Erro Interno, não foi possível localizar membro"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8b12ec033..acf209cc9 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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."
@@ -17,153 +17,154 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "O pacote %s versão %s tem uma dependência desencontrada:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Total de Nomes de Pacotes: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Total de Nomes de Pacotes: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Pacotes normais: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Pacotes puramente virtuais: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Pacotes virtuais únicos: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Pacotes virtuais misturados: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Faltando: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Total de versões distintas: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Total de descrições distintas: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Total de dependências: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Total de relações ver/arquivo: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Total de relações Desc/Arquivo: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Total de mapeamentos \"Provides\": "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Total de strings \"globbed\": "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Total de espaço de dependência de versão: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Total de espaço frouxo: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Total de espaço contabilizado para: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "O arquivo de pacote %s está fora de sincronia."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Nenhum pacote encontrado"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Você deve passar exatamente um padrão"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Impossível encontrar o pacote %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Arquivos de pacote:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Pacotes alfinetados (\"pinned\"):"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(não encontrado)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Pacote alfinetado (\"pin\"): "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Tabela de versão:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -238,30 +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:77
+#: cmdline/apt-cdrom.cc:79
 #, 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:92
+#: cmdline/apt-cdrom.cc:94
 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:127
+#: cmdline/apt-cdrom.cc:129
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Falhou ao renomear %s para %s"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 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."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Argumentos não estão em pares"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -291,12 +292,12 @@ msgstr ""
 "  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s não é um pacote DEB válido."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -321,40 +322,40 @@ msgstr ""
 "  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Impossível escrever para %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Não foi possível obter a versão do debconf. O debconf está instalado?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Lista de extensão de pacotes é muito extensa"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Erro processando o diretório %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Lista de extensão de fontes é muito extensa"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Erro ao gravar cabeçalho no arquivo de conteúdo"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Erro processando conteúdo %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -436,26 +437,26 @@ msgstr ""
 "  -c=? Lê o arquivo de configuração especificado.\n"
 "  -o=? Define uma opção de configuração arbitrária"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Nenhuma seleção combinou"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Alguns arquivos estão faltando no grupo de arquivos do pacotes '%s'"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "BD estava corrompido, arquivo renomeado para %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "BD é antigo, tentando atualizar %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 #, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
@@ -464,111 +465,111 @@ msgstr ""
 "Formato do BD é inválido. Se você atualizou a partir de uma versão antiga do "
 "apt, por favor, remova e recrie o banco de dados."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Impossível abrir o arquivo BD %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Falhou ao executar \"stat\" %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Repositório não possui registro de controle"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Impossível obter um cursor"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Impossível ler o diretório %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Impossível executar \"stat\" em %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: Erros que se aplicam ao arquivo "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Falhou ao resolver %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Falhou ao percorrer a árvore"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Falhou ao abrir %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Falhou ao executar \"readlink\" %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Falhou ao executar \"unlink\" %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Falhou ao ligar %s a %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Limite DeLink de %sB atingido.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Repositório não possuía campo pacote"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s não possui entrada override\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  mantenedor de %s é %s, não %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s não possui entrada override fonte\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s também não possui entrada override binária\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Falha ao alocar memória"
 
@@ -578,18 +579,18 @@ msgid "Unable to open %s"
 msgstr "Impossível abrir %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Override malformado %s linha %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Override malformado %s linha %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Override malformado %s linha %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -597,63 +598,51 @@ msgstr "Override malformado %s linha %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "Falha ao ler o arquivo override %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Algoritmo de compactação desconhecido '%s'"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Saída compactada %s precisa de um conjunto de compactação"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Falhou ao criar pipe IPC para sub-processo"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Falhou ao criar FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Falhou ao executar \"fork\""
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Compactar filho"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Erro interno, falhou ao criar %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Falhou ao criar sub-processo IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Falhou ao executar compactador "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "descompactador"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "E/S para sub-processo/arquivo falhou"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Falhou ao ler durante o cálculo MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Problema removendo %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Falhou ao renomear %s para %s"
@@ -662,75 +651,79 @@ msgstr "Falhou ao renomear %s para %s"
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erro de compilação de regex - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Os pacotes a seguir têm dependências desencontradas:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "mas %s está instalado"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "mas %s está para ser instalado"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "mas não é instalável"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "mas é um pacote virtual"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "mas não está instalado"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "mas não será instalado"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " ou"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Os NOVOS pacotes a seguir serão instalados:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Os pacotes a seguir serão REMOVIDOS:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Os pacotes a seguir serão atualizados:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Os pacotes a seguir serão REVERTIDOS:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Os seguintes pacotes mantidos serão mudados:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (por causa de %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -739,60 +732,60 @@ msgstr ""
 "Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está "
 "fazendo!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu revertidos, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu a serem removidos e %lu não atualizados.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Nota, selecionando %s para expressão regular '%s'\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Nota, selecionando %s para expressão regular '%s'\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "O pacote %s é um pacote virtual fornecido por:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Instalado]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 #, fuzzy
 msgid " [Not candidate version]"
 msgstr "Versões candidatas"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Você deveria selecionar explicitamente um para instalar."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -803,126 +796,126 @@ msgstr ""
 "Isto pode significar que o pacote está faltando, ficou obsoleto ou\n"
 "está disponível somente a partir de outra fonte\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "No entanto, os pacotes a seguir o substituem:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "O pacote %s não tem candidato para instalação"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Nota, selecionando %s ao invés de %s\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "A reinstalação de %s não é possível, não pode ser baixado.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s já é a versão mais nova.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s configurado para instalar manualmente.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versão selecionada %s (%s) para %s\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Versão selecionada %s (%s) para %s\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "O pacote %s não está instalado, então não será removido\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Corrigindo dependências..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " falhou."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Impossível corrigir dependências"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Impossível minimizar o conjunto de atualizações"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Pronto"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Você pode querer executar 'apt-get -f install' para corrigí-los."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependências desencontradas. Tente usar -f."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVISO: Os pacotes a seguir não podem ser autenticados!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Aviso de autenticação sobreposto.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Instalar estes pacotes sem verificação [s/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Alguns pacotes não puderam ser autenticados"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Há problemas e -y foi usado sem --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro interno, Ordenação não finalizou"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Que estranho.. Os tamanhos não batem, mande e-mail para apt@packages.debian."
@@ -930,21 +923,21 @@ 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "É preciso baixar %sB/%sB de arquivos.\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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "É preciso baixar %sB de arquivos.\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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -952,31 +945,31 @@ 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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 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:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Não foi possível determinar o espaço livre em %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Você não possui espaço suficiente em %s."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "\"Trivial Only\" especificado mas esta não é uma operação trivial."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Sim, faça o que eu digo!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -987,28 +980,28 @@ msgstr ""
 "Para continuar digite a frase '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Abortar."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Você quer continuar [S/n]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falhou ao buscar %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Alguns arquivos falharam ao baixar"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Baixar completo e no modo somente baixar (\"download only\")"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1016,19 +1009,19 @@ msgstr ""
 "Impossível buscar alguns arquivos, talvez executar apt-get update ou tentar "
 "com --fix-missing?"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing e troca de mídia não são suportados atualmente"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Impossível corrigir pacotes faltantes."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Abortando instalação."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1038,35 +1031,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "O comando update não leva argumentos"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nós não deveríamos apagar coisas, impossível iniciar AutoRemover"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1084,15 +1077,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "A informação a seguir pode ajudar a resolver a situação:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Erro Interno, o AutoRemover quebrou coisas"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1106,7 +1099,7 @@ msgstr[1] ""
 "Os seguintes pacotes foram automaticamente instalados e não são mais "
 "requeridos:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1118,19 +1111,19 @@ msgstr[1] ""
 "Os seguintes pacotes foram automaticamente instalados e não são mais "
 "requeridos:"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Use 'apt-get autoremove' para removê-los."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erro interno, AllUpgrade quebrou coisas"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Você deve querer executar 'apt-get -f install' para corrigí-los:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1138,7 +1131,7 @@ msgstr ""
 "Dependências desencontradas. Tente 'apt-get -f install' sem nenhum pacote "
 "(ou especifique uma solução)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1150,80 +1143,80 @@ msgstr ""
 "distribuição instável, que alguns pacotes requeridos não foram\n"
 "criados ainda ou foram retirados da \"Incoming\"."
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Pacotes quebrados"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Os pacotes extra a seguir serão instalados:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Pacotes sugeridos:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Pacotes recomendados:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossível achar pacote %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s configurado para instalar manualmente.\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Calculando atualização... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Falhou"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Pronto"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro interno, o solucionador de problemas quebrou coisas"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Impossível criar trava no diretório de download"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 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:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossível encontrar um pacote fonte para %s"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1231,87 +1224,87 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Pulando arquivo já baixado '%s'\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Preciso obter %sB de arquivos fonte.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter fonte %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Falhou ao buscar alguns arquivos."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comando de desempacotamento '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, 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:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comando de construção '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Processo filho falhou"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 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:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, 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:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s não tem dependências de construção.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1320,7 +1313,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:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1329,14 +1322,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:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1345,7 +1338,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:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1354,30 +1347,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:2980
+#: cmdline/apt-get.cc:3015
 #, 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:2996
+#: cmdline/apt-get.cc:3031
 #, 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:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Falhou ao processar as dependências de construção"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Conectando em %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Módulos para os quais há suporte:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1465,7 +1458,7 @@ msgstr ""
 "para mais informações e opções.\n"
 "                       Este APT tem Poderes de Super Vaca.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1473,33 +1466,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Atingido "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Obter:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ign "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Err "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Baixados %sB em %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Trabalhando]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1510,46 +1503,62 @@ msgstr ""
 " '%s'\n"
 "na unidade '%s' e pressione enter\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "mas não está instalado"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s configurado para instalar manualmente.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s configurado para instalar manualmente.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s já é a versão mais nova.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s já é a versão mais nova.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s configurado para instalar manualmente.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Falhou ao abrir %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1571,11 +1580,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Registro de pacote desconhecido!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1642,196 +1651,198 @@ msgstr "são importantes. Por favor, conserte-os e execute [I]nstalar novamente"
 msgid "Merging available information"
 msgstr "Mesclando informação disponível"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Falhou ao criar \"pipes\""
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Falhou ao executar gzip "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Arquivo corrompido"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Checksum do arquivo tar falhou, arquivo corrompido"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Assinatura de arquivo inválida"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Erro na leitura de cabeçalho membro de arquivo"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, fuzzy, c-format
 msgid "Invalid archive member header %s"
 msgstr "Cabeçalho membro de arquivo inválido"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Cabeçalho membro de arquivo inválido"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Arquivo é muito pequeno"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Falhou ao ler os cabeçalhos do arquivo"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "\"DropNode\" chamado em nó ainda ligado (\"linked\")"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Falhou ao localizar o elemento hash!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Falhou ao alocar desvio (\"diversion\")"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Erro interno em \"AddDiversion\""
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Tentando sobrescrever um desvio, %s -> %s e %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Adição dupla de desvio %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Arquivo de configuração duplicado %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Falhou ao escrever arquivo %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Falhou ao fechar arquivo %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "O caminho %s é muito longo"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Desempacotando %s mais de uma vez"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "O diretório %s é desviado (\"diverted\")"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "O caminho de desvio é muito longo"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "Falha ao localizar nó em seu \"hash bucket\""
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "O caminho é muito longo"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, 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:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Arquivo %s/%s sobrescreve arquivo no pacote %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Impossível ler %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Impossível executar \"stat\" em %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Falhou ao remover %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Impossível criar %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Falhou ao executar \"stat\" em %sinfo."
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Os diretórios info e temp precisam estar no mesmo sistema de arquivos"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Lendo listas de pacotes"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Falhou ao mudar para o diretório administrativo %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Erro interno obtendo um nome de pacote"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Lendo listagem de arquivos"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1842,114 +1853,115 @@ msgstr ""
 "restaurar este arquivo, crie-o vazio e imediatamente reinstale a mesma "
 "versão do pacote!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Falhou ao ler o arquivo de lista %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Erro interno obtendo um nó"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Falhou ao abrir o arquivo de desvios %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "O arquivo de desvios está corrompido"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Linha inválida no arquivo de desvios: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Erro interno ao adicionar um desvio"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "O cache de pacotes deve ser inicializado primeiro"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Falhou ao encontrar um Pacote: cabeçalho, posição %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Seção \"ConfFile\" ruim no arquivo de estado. Posição %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Erro analisando MD5. Posição %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Este não é um arquivo DEB válido, membro '%s' faltando"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 "Este não é um arquivo DEB válido, não possui um membro '%s', '%s' ou '%s'"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Não foi possível mudar para %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Erro interno, não foi possível localizar membro %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Falhou ao localizar um arquivo de controle válido"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Arquivo de controle não interpretável"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Não foi possível abrir \"pipe\" para %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Erro de leitura do processo %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Falhou ao executar \"stat\""
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Falhou ao definir hora de modificação"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Impossível ler o banco de dados de cdrom %s"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1957,56 +1969,56 @@ msgstr ""
 "Por favor, use o apt-cdrom para fazer com que este CD-ROM seja reconhecido "
 "pelo APT. O apt-get update não pode ser usado para adicionar novos CD-ROMs"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "CD-ROM errado"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Disco não encontrado."
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Arquivo não encontrado"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI inválida, URIs locais não devem iniciar com //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Impossível determinar o nome do ponto"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Impossível determinar o nome local"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "O servidor recusou a conexão e disse: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER falhou, servidor disse: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS falhou, servidor disse: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2014,201 +2026,201 @@ msgstr ""
 "Um servidor proxy foi especificado mas não um script de login, Acquire::ftp::"
 "ProxyLogin está vazio."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Comando de script de login '%s' falhou, servidor disse: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE falhou, servidor disse: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Conexão expirou"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Servidor fechou a conexão"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Erro de leitura"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Uma resposta sobrecarregou o buffer"
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Corrupção de protocolo"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Erro de escrita"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Não foi possível criar um socket"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "Não foi possível conectar um socket de dados, conexão expirou"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Não foi possível conectar um socket passivo."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo não foi capaz de obter um socket de escuta"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Não foi possível fazer \"bind\" de um socket"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Não foi possível ouvir no socket"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Não foi possível determinar o nome do socket"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Impossível enviar o comando PORT"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Família de endereços %u desconhecida (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT falhou, servidor disse: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Conexão do socket de dados expirou"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Impossível aceitar conexão"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Problema criando o hash do arquivo"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Impossível obter arquivo, servidor disse '%s'"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Socket de dados expirou"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Transferência de dados falhou, servidor disse '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Pesquisa"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Impossível invocar "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Conectando em %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, 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:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Não foi possível resolver '%s'"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Falha temporária resolvendo '%s'"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Impossível conectar em %s %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Ao menos uma assinatura inválida foi encontrada."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 #, 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Erro desconhecido executando gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes assinaturas eram inválidas:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2216,122 +2228,127 @@ msgstr ""
 "As assinaturas a seguir não puderam ser verificadas devido à chave pública "
 "não estar disponível:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Aguardando por cabeçalhos"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Linha de cabeçalho ruim"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "O servidor HTTP enviou um cabeçalho \"Content-Length\" inválido"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "O servidor HTTP enviou um cabeçalho \"Content-Range\" inválido"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Este servidor HTTP possui suporte a \"range\" quebrado"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Formato de data desconhecido"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Seleção falhou"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Conexão expirou"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Erro escrevendo para arquivo de saída"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Erro escrevendo para arquivo"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Erro escrevendo para o arquivo"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Erro lendo do servidor"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Falhou ao truncar arquivo"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Dados de cabeçalho ruins"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Conexão falhou"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Não foi possível fazer \"mmap\" de um arquivo vazio"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Não foi possível abrir \"pipe\" para %s"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Não foi possível fazer \"mmap\" de %lu bytes"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "Impossível abrir %s"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "Impossível invocar "
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Não foi possível fazer \"mmap\" de %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Falhou ao truncar arquivo"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2360,95 +2377,95 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Seleção %s não encontrada"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Abreviação de tipo desconhecida: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Abrindo arquivo de configuração %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Erro de sintaxe %s:%u: Bloco inicia sem nome."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Erro de sintaxe %s:%u: Tag mal formada"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Erro de sintaxe %s:%u: Diretivas podem ser feitas somente no nível mais alto"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Erro de sintaxe %s:%u: Muitos \"includes\" aninhados"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Erro de sintaxe %s:%u: Não há suporte para a diretiva '%s'"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Erro de sintaxe %s:%u: Diretivas podem ser feitas somente no nível mais alto"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Erro de sintaxe %s:%u: Lixo extra no final do arquivo"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Erro!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Pronto"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Opção de linha de comando '%c' [de %s] é desconhecida."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Opção de linha de comando %s não é compreendida"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Opção de linha de comando %s não é booleana"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Opção %s requer um argumento."
@@ -2459,348 +2476,366 @@ msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 "Opção %s: Especificação de item de configuração deve possuir um =<val>."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Opção %s requer um argumento inteiro, não '%s'"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Opção '%s' é muito longa"
 
-#: 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 "Sentido %s não é compreendido, tente verdadeiro ou falso."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Operação %s inválida"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Impossível executar \"stat\" no ponto de montagem %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Impossível mudar para %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Impossível executar \"stat\" no cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, 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:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Não foi possível obter trava %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperado %s mas este não estava lá"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, 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:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, 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:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, 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:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Sub-processo %s finalizou inesperadamente"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Não foi possível abrir arquivo %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, 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:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Falhou ao criar sub-processo IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Falhou ao executar compactador "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, 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:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, 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:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problema fechando o arquivo"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Problema fechando o arquivo"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problema sincronizando o arquivo"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problema removendo o arquivo"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Problema sincronizando o arquivo"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Cache de pacotes vazio"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "O arquivo de cache de pacotes está corrompido"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "O arquivo de cache de pacotes é uma versão incompatível"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "O arquivo de cache de pacotes está corrompido"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Este APT não suporta o sistema de versões '%s'"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 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:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Depende"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Pré-Depende"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Sugere"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Recomenda"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Conflita"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Substitui"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Obsoleta"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Quebra"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "requerido"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "padrão"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "opcional"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Construindo árvore de dependências"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Versões candidatas"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Geração de dependência"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Lendo informação de estado"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Impossível analisar arquivo de pacote %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Impossível analisar arquivo de pacote %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição absoluta)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Linha %u muito longa na lista de fontes %s."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, 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:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, 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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Não foi possível abrir arquivo %s"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2812,19 +2847,12 @@ msgstr ""
 "é ruim, mas se você realmente quer fazer isso, ative a opção APT::Force-"
 "LoopBreak."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Tipo de arquivo de índice '%s' não é suportado"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2832,7 +2860,7 @@ msgstr ""
 "O pacote %s precisa ser reinstalado, mas não foi possível encontrar um "
 "arquivo para o mesmo."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2840,11 +2868,11 @@ msgstr ""
 "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
 "pacotes mantidos (hold)."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados."
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2853,240 +2881,202 @@ msgstr ""
 "Alguns arquivos de índice falharam para baixar, eles foram ignorados ou os "
 "antigos foram usados no lugar."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Diretório de listas %spartial está faltando."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Diretório de arquivos %spartial está faltando."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "Impossível criar trava no diretório de listas"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Obtendo o arquivo %li de %li (%s restantes)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Obtendo arquivo %li de %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "O driver do método %s não pode ser encontrado."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Método %s não iniciou corretamente"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: 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:163
+#: 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."
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Impossível executar \"stat\" %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Você deve colocar algumas URIs 'source' em seu sources.list"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "As listas de pacotes ou os arquivos de estado não puderam ser analisados ou "
 "abertos."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Você terá que executar apt-get update para corrigir estes problemas"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "A lista de fontes não pode ser lida."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Registro inválido no arquivo de preferências, sem cabeçalho Package"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Não foi possível entender o tipo de \"pin\" %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Nenhuma prioridade (ou zero) especificada para \"pin\""
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "O cache possui um sistema de versões incompatível"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Um erro ocorreu processando %s (NovoPacote)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Um erro ocorreu processando %s (UsePacote1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Um erro ocorreu processando %s (NovoArquivoDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Um erro ocorreu processando %s (UsePacote2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Um erro ocorreu processando %s (NovaVersão1)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Um erro ocorreu processando %s (UsePacote3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Um erro ocorreu processando %s (NovoArquivoDesc2)"
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de nomes de pacotes que este APT é capaz de "
 "suportar."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de versões que este APT é capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de descrições que este APT é capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 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:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Um erro ocorreu processando %s (ColetarArquivoProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, 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:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Coletando Arquivo \"Provides\""
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "Erro de E/S ao gravar cache fonte"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "renomeação falhou, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum incorreto"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Hash Sum incorreto"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3094,12 +3084,12 @@ msgid ""
 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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3109,7 +3099,7 @@ msgstr ""
 "que você precisa consertar manualmente este pacote. (devido a arquitetura "
 "não especificada)."
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3118,7 +3108,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:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3126,41 +3116,41 @@ msgstr ""
 "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:"
 "\" para o pacote %s."
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Tamanho incorreto"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Impossível analisar arquivo de pacote %s (1)"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Nota, selecionando %s ao invés de %s\n"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, 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:125
+#: apt-pkg/indexrecords.cc:137
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Impossível analisar arquivo de pacote %s (1)"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Bloco fornecedor %s não contém impressão digital (\"fingerprint\")"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3169,41 +3159,41 @@ msgstr ""
 "Usando ponto de montagem de CD-ROM %s\n"
 "Montando CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Identificando.. "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Rótulo armazenado: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "Desmontando CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Usando ponto de montagem de CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Desmontando CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Aguardando por disco...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Montando CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Procurando por arquivos de índice no disco..\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3212,22 +3202,22 @@ msgstr ""
 "Encontrado(s) %zu índice(s) de pacote(s), %zu índice(s) de fonte(s), %zu "
 "índice(s) de traduções e %zu assinatura(s)\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Rótulo encontrado: '%s'\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Este não é um nome válido, tente novamente.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3236,295 +3226,368 @@ msgstr ""
 "Esse disco é chamado: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Copiando lista de pacotes..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Gravando nova lista de fontes\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 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:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Gravados %i registros.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Gravados %i registros com %i arquivos faltando.\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Gravados %i registros com %i arquivos faltando e %i arquivos que não "
 "combinam\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Abrindo arquivo de configuração %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum incorreto"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Abortando instalação."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release '%s' para '%s' não foi encontrada"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versão '%s' para '%s' não foi encontrada"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Impossível achar tarefa %s"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Impossível achar pacote %s"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Removendo %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "%s completamente removido"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Diretório '%s' está faltando"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Não foi possível abrir arquivo %s"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempacotando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparando para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparando para a remoção de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "%s removido"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparando para remover completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s completamente removido"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Impossível criar trava no diretório de listas"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Não foi possível abrir arquivo %s"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Conexão encerrada prematuramente"
 
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Override malformado %s linha %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Override malformado %s linha %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Override malformado %s linha %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "descompactador"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "escrita, ainda restam %lu para gravar mas não foi possível"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Um erro ocorreu processando %s (NovoPacote)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Um erro ocorreu processando %s (UsePacote1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Um erro ocorreu processando %s (NovoArquivoDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Um erro ocorreu processando %s (UsePacote2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Um erro ocorreu processando %s (NovaVersão1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Um erro ocorreu processando %s (UsePacote3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Um erro ocorreu processando %s (NovoArquivoDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Um erro ocorreu processando %s (ColetarArquivoProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Erro interno, não foi possível localizar membro"
 
diff --git a/po/ro.po b/po/ro.po
index 9fa1d8805..e0ebab658 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -19,152 +19,153 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Pachetul %s versiunea %s are o dependență neîndeplinită:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Total nume pachete : "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Total nume pachete : "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Pachete normale: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Pachete virtuale pure: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Pachete virtuale singulare: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Pachete virtuale mixte: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Lipsă: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Total versiuni distincte: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Numărul total de descrieri distincte: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Total dependențe: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Total relații versiune/fișier: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Total relații desc/fișier: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Total cartări Furnizează: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Total șiruri înglobate: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Total spațiu versiuni ale dependențelor: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Total spațiu intern: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Total spațiu contorizat pentru: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Fișierul pachetului %s este desincronizat."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Nu s-au găsit pachete"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Trebuie să dați exact un șablon"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nu s-a putut localiza pachetul %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Fișiere pachet: "
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Pachete alese special:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(negăsit)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Instalat: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Candidează: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(niciunul)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Pachet ales special: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Tabela de versiuni:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -237,29 +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:77
+#: cmdline/apt-cdrom.cc:79
 #, 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:92
+#: cmdline/apt-cdrom.cc:94
 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:127
+#: cmdline/apt-cdrom.cc:129
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Eșec la redenumirea lui %s în %s"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Repetați această procedură pentru restul CD-urilor din set."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Argumentele nu sunt perechi"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -288,12 +289,12 @@ 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:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s nu este un pachet DEB valid."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -317,40 +318,40 @@ 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:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Nu s-a putut scrie în %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Nu s-a putut citi versiunea debconf. Este instalat debconf?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Lista de extensii pentru pachet este prea lungă"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Eroare la prelucrarea directorului %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Lista de extensii pentru sursă este prea lungă"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Eroare la scrierea antetului în fișierul index"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Eroare la prelucrarea conținutului %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -438,26 +439,26 @@ msgstr ""
 "  -c=? Citește acest fișier de configurare\n"
 "  -o=? Ajustează o opțiune de configurare arbitrară"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Nu s-a potrivit nici o selecție"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Unele fișiere lipsesc din grupul fișierului pachet '%s'"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "DB a fost corupt, fișierul a fost redenumit %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB este vechi, se încearcă înnoirea %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 #, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
@@ -466,111 +467,111 @@ msgstr ""
 "Formatul DB este nevalid. Dacă l-ați înnoit pe apt de la o versiune mai "
 "veche, ștergeți și recreați baza de date."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Nu s-a putut deschide fișierul DB %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Eșec la „stat” pentru %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Arhiva nu are înregistrare de control"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Nu s-a putut obține un cursor"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "A: Nu s-a putut citi directorul %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "A: Nu s-a putut efectua „stat” pentru %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "A: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: Erori la fișierul "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Eșec la „resolve” pentru %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Parcurgerea arborelui a eșuat"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Eșec la „open” pentru %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " Dezlegare %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Eșec la „readlink” pentru %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Eșec la „unlink” pentru %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Eșec la „link” între %s și %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Limita de %sB a dezlegării a fost atinsă.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Arhiva nu are câmp de pachet"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s nu are intrare de înlocuire\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s responsabil este %s nu %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s nu are nici o intrare sursă de înlocuire\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s nu are nici intrare binară de înlocuire\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Eșec la alocarea memoriei"
 
@@ -580,18 +581,18 @@ msgid "Unable to open %s"
 msgstr "Nu s-a putut deschide %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Înlocuire greșită %s linia %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Înlocuire greșită %s linia %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Înlocuire greșită %s linia %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -599,63 +600,51 @@ msgstr "Înlocuire greșită %s linia %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "Eșec la citirea fișierului de înlocuire a permisiunilor %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Algoritm de compresie necunoscut '%s'"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Rezultatul comprimat %s are nevoie de o ajustare a compresiei"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Eșec la crearea conexiunii IPC către subproces"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Eșec la crearea FIȘIERULUI*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Eșec la „fork”"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Comprimare copil"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Eroare internă, eșec la crearea lui %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Eșec la crearea IPC-ului pentru subproces"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Eșec la executarea compresorului"
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "decompresor"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "IE către subproces/fișier eșuat"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Eșec la citire în timpul calculului sumei MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Problemă la desfacerea %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Eșec la redenumirea lui %s în %s"
@@ -664,75 +653,79 @@ msgstr "Eșec la redenumirea lui %s în %s"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Eroare de compilare expresie regulată - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Următoarele pachete au dependențe neîndeplinite:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "dar %s este instalat"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "dar %s este pe cale de a fi instalat"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "dar nu este instalabil"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "dar este un pachet virtual"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "dar nu este instalat"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "dar nu este pe cale să fie instalat"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " sau"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Următoarele pachete NOI vor fi instalate:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Următoarele pachete vor fi ȘTERSE:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Următoarele pachete au fost reținute:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Următoarele pachete vor fi ÎNNOITE:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Următoarele pachete vor fi DE-GRADATE:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Următoarele pachete ținute vor fi schimbate:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (datorită %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -740,60 +733,60 @@ msgstr ""
 "AVERTISMENT: Următoarele pachete esențiale vor fi șterse.\n"
 "Aceasta NU ar trebui făcută decât dacă știți exact ce vreți!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu înnoite, %lu nou instalate, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalate, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu de-gradate, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu de șters și %lu neînnoite.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu instalate sau șterse incomplet.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Pachetul %s este un pachet virtual furnizat de către:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Instalat]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 #, fuzzy
 msgid " [Not candidate version]"
 msgstr "Versiuni candidat"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Ar trebui să alegeți în mod explicit unul pentru instalare."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -804,179 +797,179 @@ msgstr ""
 "Aceasta ar putea însemna că pachetul lipsește, s-a învechit, sau\n"
 "este disponibil numai din altă sursă\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Oricum următoarele pachete îl înlocuiesc:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Pachetul %s nu are nici un candidat la instalare"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Notă, se selectează %s în locul lui %s\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s este deja la cea mai nouă versiune.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s este marcat ca fiind instalat manual.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versiune selectată %s (%s) pentru %s\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Versiune selectată %s (%s) pentru %s\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Corectez dependențele..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " eșec."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Nu s-au putut corecta dependențele"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Nu s-a putut micșora mulțimea pachetelor de înnoit"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Terminat"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Ați putea să porniți 'apt-get -f install' pentru a corecta acestea."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependențe neîndeplinite. Încercați să folosiți -f."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Avertisment de autentificare înlocuit.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Instalați aceste pachete fără verificare [y/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Unele pachete n-au putut fi autentificate"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Sunt unele probleme și -y a fost folosit fără --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Eroare internă, Ordering nu s-a terminat"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Ce ciudat.. Dimensiunile nu se potrivesc, scrieți la apt@packages.debian.org"
 
 #. 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Este nevoie să descărcați %sB/%sB de arhive.\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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Este nevoie să descărcați %sB de arhive.\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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "După această operație vor fi folosiți din disc încă %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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 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:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "N-am putut determina spațiul disponibil în %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Nu aveți suficient spațiu în %s."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "A fost specificat 'doar neimportant' dar nu este o operațiune neimportantă."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Da, fă cum îți spun!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -987,28 +980,28 @@ msgstr ""
 "Pentru a continua tastați fraza '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Renunțare."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vreți să continuați [Y/n]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Eșec la aducerea lui %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Descărcarea unor fișiere a eșuat"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Descărcare completă și în modul doar descărcare"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1016,19 +1009,19 @@ msgstr ""
 "Nu s-au putut aduce unele arhive, poate ar fi o idee bună să rulați 'apt-get "
 "update' sau încercați cu --fix-missing?"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing și schimbul de mediu nu este deocamdată suportat"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Nu pot corecta pachetele lipsă."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Abandonez instalarea."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1039,36 +1032,36 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Nu pot determina starea listei surse de pachete %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Comanda de actualizare nu are argumente"
 
 # XXX: orice sugestie este bine-venită
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nu este voie să se șteargă lucruri, nu se poate porni AutoRemover"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1087,15 +1080,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "Următoarele informații ar putea să vă ajute la rezolvarea situației:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1109,7 +1102,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1121,19 +1114,19 @@ msgstr[1] ""
 msgstr[2] ""
 "Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Folosiți 'apt-get autoremove' pentru a le șterge."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Ați putea porni 'apt-get -f install' pentru a corecta acestea:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1141,7 +1134,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:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1154,81 +1147,81 @@ msgstr ""
 "pachete\n"
 "cerute n-au fost create încă sau au fost mutate din Incoming."
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Pachete deteriorate"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Următoarele extra pachete vor fi instalate:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Pachete sugerate:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Pachete recomandate:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nu pot găsi pachetul %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s este marcat ca fiind instalat manual.\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Calculez înnoirea... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Eșec"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Terminat"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Nu s-a putut bloca directorul de descărcare"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 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:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, 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:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1236,87 +1229,87 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Sar peste fișierul deja descărcat '%s'\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, 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:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Aducere sursa %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Eșec la aducerea unor arhive."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comanda de despachetare '%s' eșuată.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, 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:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comanda de construire '%s' eșuată.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Procesul copil a eșuat"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 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:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, 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:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nu are dependențe înglobate.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1325,7 +1318,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:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1334,14 +1327,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:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1350,7 +1343,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:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1359,30 +1352,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:2980
+#: cmdline/apt-get.cc:3015
 #, 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:2996
+#: cmdline/apt-get.cc:3031
 #, 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:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Eșec la prelucrarea dependențelor de compilare"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Conectare la %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Module suportate:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1471,7 +1464,7 @@ msgstr ""
 "pentru mai multe informații și opțiuni.\n"
 "                       Acest APT are puterile unei Super Vaci.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1479,33 +1472,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Atins "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Luat:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ignorat "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Eroare"
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Aduși: %sB în %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [În lucru]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1516,46 +1509,62 @@ msgstr ""
 " „%s”\n"
 "în unitatea „%s” și apăsați Enter\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "dar nu este instalat"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s este marcat ca fiind instalat manual.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s este marcat ca fiind instalat manual.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s este deja la cea mai nouă versiune.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s este deja la cea mai nouă versiune.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s este marcat ca fiind instalat manual.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Eșec la „open” pentru %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1577,11 +1586,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Înregistrare de pachet necunoscut!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1645,200 +1654,202 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Se combină informațiile disponibile"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Eșec la crearea conexiunilor"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Eșec la executarea lui gzip "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Arhivă deteriorată"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 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:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Tip antet TAR %u necunoscut, membrul %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Semnătură de arhivă necorespunzătoare"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Eroare la citirea antetului membrului arhivei"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, fuzzy, c-format
 msgid "Invalid archive member header %s"
 msgstr "Antet de membru de arhivă necorespunzător"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Antet de membru de arhivă necorespunzător"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Arhiva este prea scurtă"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Eșec la citirea antetelor arhivei"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "S-a chemat DropNode pe un nod încă „legat”"
 
 # XXX: nu-mi place, fie e hash, fie „element de dispersie”
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Eșec la localizarea elementului de dispersie!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Eșec la alocarea redirectării"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Eroare internă în „AddDiversion”"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Încercare de suprascriere a redirectării, %s -> %s și %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Adăugare dublă de redirectare %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Fișier „conf” duplicat %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Eșec la scrierea fișierului %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Eșec la închiderea fișierului %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Calea %s este prea lungă"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Se despachetează %s de mai multe ori"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Directorul %s este redirectat"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Calea de redirectare este prea lungă"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 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:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Calea este prea lungă"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, 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:429
+#: apt-inst/extract.cc:432
 #, 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"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nu s-a putut citi %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Nu se poate executa „stat” pe %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Eșec la ștergerea lui %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Nu s-a putut crea %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Eșec la „stat” pentru %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Directoarele info și temp trebuie să fie în același sistem de fișiere"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Citire liste de pachete"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr ""
 "Eșec la schimbarea directorului către directorul de administrare %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Eroare internă la preluarea numelui de pachet"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Se citește lista de fișiere"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1849,117 +1860,118 @@ msgstr ""
 "acest fișier atunci goliți-l și, apoi, imediat reinstalați aceeași versiune "
 "a pachetului!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Citirea fișierului-listă %sinfo/%s a eșuat"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Eroare internă la preluarea unui nod"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Eșec la deschiderea fișierului de redirectări %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "Fișierul-redirectare este deteriorat"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Linie necorespunzătoare în fișierul-redirectare: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Eroare internă în timpul adăugării unei redirectări"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "Cache-ul de pachete trebuie mai întâi inițializat"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Eșec la găsirea unui antet „Package:”, deplasamentul este %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr ""
 "Secțiune necorespunzătoare ConfFile în fișierul de stare. Deplasamentul este "
 "%lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Eroare la analiza MD5. Deplasamentul este %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Aceasta nu este o arhivă DEB validă, lipsește membrul „%s”"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 "Aceasta nu este o arhivă DEB validă, nu are unul din următorii membri „%s”, "
 "„%s” sau „%s”"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Nu s-a putut schimba directorul la %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Eroare internă, nu pot localiza membrul %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Eșec la localizare a unui fișier de control valid"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Fișier de control neanalizabil"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Nu s-a putut deschide conexiunea pentru %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Eroare de citire din procesul %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Eșec la „stat”"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Eșec la ajustarea timpului de modificare"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Nu s-a putut citi baza de date de CD %s"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1967,56 +1979,56 @@ msgstr ""
 "Folosiți apt-cdrom pentru a-l face pe APT să recunoască acest CD. „apt-get "
 "update” nu poate fi folosit pentru adăugarea de noi CD-uri"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "CD-ROM necorespunzător"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Nu se poate demonta CD-ul din %s, poate este încă utilizat."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Disc negăsit."
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Fișier negăsit"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI invalid, URI-uile locale trebuie să nu înceapă cu //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Se autentifică"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Nu se poate detecta numele perechii"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Nu s-a putut detecta numele local"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Serverul a refuzat conexiunea și a spus: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "„USER” a eșuat, serverul a spus: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "„PASS” a eșuat, serverul a spus: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2024,203 +2036,203 @@ msgstr ""
 "Un server proxy a fost precizat, dar nu există nici un script de conectare, "
 "Acquire::ftp::ProxyLogin este gol."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Scriptul „%s” cu comenzile de conectare a eșuat, serverul a spus: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "„TYPE” a eșuat, serverul a spus: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Timpul de conectare a expirat"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Serverul a închis conexiunea"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Eroare de citire"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Un răspuns a depășit zona de tampon."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Protocol corupt"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Eroare de scriere"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Nu s-a putut crea un socket"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Nu s-a putut realiza conectarea la socket-ul de date, timpul de conectare a "
 "expirat"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Nu s-a putut realiza conectarea la un socket pasiv"
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "„getaddrinfo” n-a reușit să obțină un socket de ascultare"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Nu s-a putut realiza asocierea la un socket"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Nu s-a putut asculta pe socket"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Nu s-a putut detecta numele socket-ului"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Nu s-a putut trimite comanda PORT"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Familie de adrese necunoscută %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "„EPRT” a eșuat, serverul a spus: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Timpul de conectare la socket-ul de date expirat"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Nu s-a putut accepta conexiune"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Problemă la calcularea dispersiei pentru fișierul"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Nu s-a putut aduce fișierul, serverul a spus „%s”"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Timp expirat pentru socket-ul de date"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Transferul de date a eșuat, serverul a spus: '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Interogare"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Nu s-a putut invoca"
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Conectare la %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, 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:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectare la %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nu s-a putut rezolva „%s”"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Eșec temporar la rezolvarea lui „%s”"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, 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:243
+#: methods/connect.cc:247
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nu s-a putut realiza conexiunea cu %s %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Cel puțin o semnătură nevalidă a fost întâlnită."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 #, 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Eroare necunoscută în timp ce se execută gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Următoarele semnături nu au fost valide:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2228,123 +2240,128 @@ msgstr ""
 "Următoarele semnături n-au putut fi verificate, deoarece cheia publică nu "
 "este disponibilă:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "În așteptarea antetelor"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "S-a primit o singură linie de antet de peste %u caractere"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Linie de antet necorespunzătoare"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Serverul HTTP a trimis un antet de răspuns necorespunzător"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Serverul HTTP a trimis un antet Content-Length necorespunzător"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Serverul HTTP a trimis un antet zonă de conținut necorespunzător"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Acest server HTTP are un suport defect de intervale"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Format dată necunoscut"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Selecția a eșuat"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Timp de conectare expirat"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Eroare la scrierea fișierului de rezultat"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Eroare la scrierea în fișier"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Eroare la scrierea în fișierul"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 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:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Eroare la citirea de la server"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Eșec la trunchierea fișierului"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Antet de date necorespunzător"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Conectare eșuată"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Eroare internă"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Nu s-a putut executa „mmap” cu un fișier gol"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Nu s-a putut deschide conexiunea pentru %s"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Nu s-a putut face mmap cu %lu octeți"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "Nu s-a putut deschide %s"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "Nu s-a putut invoca"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Nu s-a putut face mmap cu %lu octeți"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Eșec la trunchierea fișierului"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2373,95 +2390,95 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selecția %s nu a fost găsită"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Abreviere de tip nerecunoscut: „%c”"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Se deschide fișierul de configurare %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Eroare de sintaxă %s:%u: Blocul începe fără nume"
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Eroare de sintaxă %s:%u: etichetă greșită"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare după valoare"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Eroare de sintaxă %s:%u: Directivele pot fi date doar la nivelul superior"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Eroare de sintaxă %s:%u: prea multe imbricări incluse"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Eroare de sintaxă %s:%u: incluse de aici"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Eroare de sintaxă %s:%u: directivă nesuportată '%s'"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Eroare de sintaxă %s:%u: Directivele pot fi date doar la nivelul superior"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare la sfârșitul fișierului"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Eroare!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Terminat"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Opțiunea linie de comandă '%c' [din %s] este necunoscută."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Opțiunea linie de comandă %s nu este înțeleasă"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Opțiunea linie de comandă %s nu este booleană"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Opțiunea %s necesită un argument"
@@ -2472,343 +2489,361 @@ msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 "Opțiunea %s: Specificația configurării articolului trebuie să aibă o =<val>."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Opțiunea %s necesită un argument integru, nu '%s'"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Opțiunea '%s' este prea lungă"
 
-#: 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 "Sensul %s nu este înțeles, încercați adevărat (true) sau fals (false)."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Operațiune invalidă %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Nu pot determina starea punctului de montare %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nu pot schimba la %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Eșec la „stat” pentru CD"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Nu pot deschide fișierul blocat %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Nu pot determina blocajul %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Așteptat %s, dar n-a fost acolo"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Subprocesul %s a primit o eroare de segmentare."
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Subprocesul %s a primit o eroare de segmentare."
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, 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:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Subprocesul %s s-a terminat brusc"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nu s-a putut deschide fișierul %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nu s-a putut deschide conexiunea pentru %s"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Eșec la crearea IPC-ului pentru subproces"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Eșec la executarea compresorului"
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, 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:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, 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:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problemă la închiderea fișierului"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Problemă la închiderea fișierului"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problemă în timpul sincronizării fișierului"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problemă la dezlegarea fișierului"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Problemă în timpul sincronizării fișierului"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Cache gol de pachet"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Cache-ul fișierului pachet este deteriorat"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "Fișierul cache al pachetului este o versiune incompatibilă"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Cache-ul fișierului pachet este deteriorat"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Acest APT nu suportă versioning system '%s'"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 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:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Depinde"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Pre-depinde"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Sugerează"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Recomandă"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Este în conflict"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Înlocuiește"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Învechit"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Corupe"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "important"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "cerut"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "opțional"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Se construiește arborele de dependență"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Versiuni candidat"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Generare dependențe"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Se citesc informațiile de stare"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Eșec la deschiderea fișierului de stare %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Eșec la scrierea fișierului temporar de stare %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Nu s-a putut analiza fișierul pachet %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Linie greșită %lu în lista sursă %s (dist)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Linie greșită %lu în lista sursă %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Linie greșită %lu în lista sursă %s (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Linie greșită %lu în lista sursă %s (analiza URI)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Linie greșită %lu în lista sursă %s (dist. absolută)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Deschidere %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Linia %u prea lungă în lista sursă %s."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, 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:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, 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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Nu s-a putut deschide fișierul %s"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2820,26 +2855,19 @@ msgstr ""
 "nu-i de bine, dar dacă vreți întradevăr s-o faceți, activați opțiunea APT::"
 "Force-LoopBreak."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Tipul de fișier index '%s' nu este suportat"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 "Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2847,11 +2875,11 @@ msgstr ""
 "Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi "
 "cauzată de pachete ținute."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nu pot corecta problema, ați ținut pachete deteriorate."
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2860,243 +2888,205 @@ 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:79
+#: apt-pkg/acquire.cc:81
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Directorul de liste %spartial lipsește."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Directorul de arhive %spartial lipsește."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "Nu pot încuia directorul cu lista"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Se descarcă fișierul %li din %li (%s rămas)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Se descarcă fișierul %li din %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Metoda driver %s nu poate fi găsită."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Metoda %s nu s-a lansat corect"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: 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:163
+#: 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"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Nu pot determina starea %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Trebuie să puneți niște 'surse' de URI în sources.list"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Listele de pachete sau fișierul de stare n-au putut fi analizate sau "
 "deschise."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Ați putea vrea să porniți 'apt-get update' pentru a corecta aceste probleme."
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Lista surselor nu poate fi citită."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Înregistrare invalidă în fișierul de preferințe, fără antet de pachet"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Nu s-a înțeles tipul de pin %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Fără prioritate (sau zero) specificată pentru pin"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Cache are un versioning system incompatibil"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Eroare apărută în timpul procesării %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Eroare apărută în timpul procesării %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "A apărut o eroare în timpul procesării lui %s (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Eroare apărută în timpul procesării %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Eroare apărută în timpul procesării %s (NewVersion1)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Eroare apărută în timpul procesării %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "A apărut o eroare în timpul procesării lui %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Mamăăă, ați depășit numărul de nume de pachete de care este capabil acest "
 "APT."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Mamăăă, ați depășit numărul de versiuni de care este capabil acest APT."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Mamăăă, ați depășit numărul de descrieri de care este capabil acest APT."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 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:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Eroare apărută în timpul procesării %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nu pot determina starea listei surse de pachete %s"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Colectare furnizori fișier"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "Eroare IO în timpul salvării sursei cache"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "redenumire eșuată, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "Nepotrivire MD5Sum"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Nepotrivire la suma de căutare"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3104,12 +3094,12 @@ msgid ""
 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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3118,7 +3108,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:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3127,7 +3117,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:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3135,41 +3125,41 @@ msgstr ""
 "Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la "
 "pachetul %s."
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Nepotrivire dimensiune"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, 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:63
+#: apt-pkg/indexrecords.cc:71
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Notă, se selectează %s în locul lui %s\n"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, 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:125
+#: apt-pkg/indexrecords.cc:137
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Blocul vânzător %s nu conține amprentă"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3178,42 +3168,42 @@ msgstr ""
 "Utilizare puct de montare CD-ROM %s\n"
 "Montare CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Identificare.. "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Etichetă memorată: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "Se demontează CD-ul...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Utilizare punct de montare CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Demontare CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Aștept discul...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Montez CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Scanez discul de fișierele index..\n"
 
 # DEVELOPERS: please consider using somehow plural forms
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3222,22 +3212,22 @@ msgstr ""
 "Au fost găsite %zu indexuri de pachete, %zu indexuri de surse, %zu indexuri "
 "de traduceri și %zu semnături\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "A fost găsită eticheta „%s”\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Acesta nu este un nume valid, mai încercați.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3246,295 +3236,368 @@ msgstr ""
 "Acest disc este numit: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Copiez listele de pachete.."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Scriere noua listă sursă\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "Intrările listei surselor pentru acest disc sunt:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "S-au scris %i înregistrări.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, 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:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "S-au scris %i înregistrări cu %i fișiere lipsă și %i fișiere nepotrivite\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Se deschide fișierul de configurare %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Nepotrivire la suma de căutare"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Abandonez instalarea."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release '%s' pentru '%s' n-a fost găsită"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Nu s-a putut găsi sarcina %s"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Nu pot găsi pachetul %s"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "Se instalează %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Se configurează %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Se șterge %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Șters complet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directorul „%s” lipsește."
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Nu s-a putut deschide fișierul %s"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Se pregătește %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Se despachetează %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Se pregătește configurarea %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "Instalat %s"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Se pregătește ștergerea lui %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "Șters %s"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Se pregătește ștergerea completă a %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "Șters complet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Nu pot încuia directorul cu lista"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Nu s-a putut deschide fișierul %s"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Conexiune închisă prematur"
 
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Înlocuire greșită %s linia %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Înlocuire greșită %s linia %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Înlocuire greșită %s linia %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "decompresor"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "scriere, încă mai am %lu de scris dar nu pot"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Eroare apărută în timpul procesării %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Eroare apărută în timpul procesării %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "A apărut o eroare în timpul procesării lui %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Eroare apărută în timpul procesării %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Eroare apărută în timpul procesării %s (NewVersion1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Eroare apărută în timpul procesării %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "A apărut o eroare în timpul procesării lui %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Eroare apărută în timpul procesării %s (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Eroare internă, nu a putut fi localizat membrul"
 
diff --git a/po/ru.po b/po/ru.po
index cf5323b67..05df58c7f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.15.9\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-14 12:59+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+0200\n"
 "PO-Revision-Date: 2012-01-06 10:36+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -26,149 +26,150 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Пакет %s версии %s имеет неудовлетворённую зависимость:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Всего имён пакетов : "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Всего структур пакетов: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Обычных пакетов: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Полностью виртуальных пакетов: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Одиночных виртуальных пакетов: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Смешанных виртуальных пакетов: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Отсутствует: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Всего уникальных версий: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Всего уникальных описаний: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Всего зависимостей: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Всего отношений Версия/Файл: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Всего отношений Описание/Файл: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Всего отношений Provides: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Всего развёрнутых строк: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Всего информации о зависимостях: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Пустого места в кэше: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Полное учтённое пространство: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Список пакетов %s рассинхронизирован."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Не найдено ни одного пакета"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "Вы должны задать не менее одно шаблона поиска"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr "Эта команда устарела. Используйте вместо неё «apt-mark showauto»."
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Не удалось найти пакет %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Списки пакетов:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Кэш рассинхронизирован, невозможно обнаружить ссылку на список пакетов"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Зафиксированные пакеты:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(не найдено)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Установлен: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Кандидат: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(отсутствует)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Фиксатор пакета: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Таблица версий:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3235 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -238,28 +239,28 @@ msgstr ""
 "  -o=? Задать значение произвольной настройки, например, -o dir::cache=/tmp\n"
 "Подробности в справочных страницах apt-cache(8) и apt.conf(5).\n"
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Вставьте диск в устройство и нажмите ввод"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Не удалось примонтировать «%s» к «%s»"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Повторите этот процесс для всех имеющихся CD."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Непарные аргументы"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -288,12 +289,12 @@ msgstr ""
 "   -o=? Задать значение произвольной настройке, например, -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s не является правильным DEB-пакетом."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -316,41 +317,41 @@ msgstr ""
 "  -c=? Читать указанный файл настройки\n"
 "  -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1164
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Невозможно записать в %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Невозможно определить версию debconf. Он установлен?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Список расширений, допустимых для пакетов, слишком длинен"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Список расширений источников слишком длинен"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr ""
 "Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "ошибка обработки полного перечня содержимого пакетов (Contents) %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -436,26 +437,26 @@ msgstr ""
 "  -c=?  Использовать указанный файл настройки\n"
 "  -o=?  Задать значение произвольному параметру настройки"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Совпадений не обнаружено"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "В группе пакетов «%s» отсутствуют некоторые файлы"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "БД была повреждена, файл переименован в %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB устарела, попытка обновить %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -463,111 +464,111 @@ msgstr ""
 "Некорректный формат базы данных (DB). Если вы обновляли версию apt, удалите "
 "и создайте базу данных заново."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Не удалось открыть DB файл %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Не удалось получить атрибуты %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "В архиве нет поля control"
 
-#: ftparchive/cachedb.cc:452
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Невозможно получить курсор"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Не удалось прочитать каталог %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Не удалось прочитать атрибуты %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: Ошибки относятся к файлу "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Не удалось проследовать по ссылке %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Не удалось совершить обход дерева"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Не удалось открыть %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr "DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Не удалось прочесть ссылку %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Не удалось удалить %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Не удалось создать ссылку %s на %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Превышен лимит в %sB в DeLink.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "В архиве нет поля package"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  Нет записи о переназначении (override) для %s\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: 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:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  Нет записи source override для %s\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  Нет записи binary override для %s\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc — не удалось выделить память"
 
@@ -577,18 +578,18 @@ msgid "Unable to open %s"
 msgstr "Не удалось открыть %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Неправильная запись о переназначении (override) %s на строке %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Неправильная запись о переназначении (override) %s на строке %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Неправильная запись о переназначении (override) %s на строке %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -596,64 +597,52 @@ msgstr "Неправильная запись о переназначении (o
 msgid "Failed to read the override file %s"
 msgstr "Не удалось прочесть файл переназначений (override)%s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Неизвестный алгоритм сжатия «%s»"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr ""
 "Для получения сжатого вывода %s необходимо включить использования сжатия"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Не удалось создать IPC-канал для порождённого процесса"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Не удалось создать FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Не удалось запустить порождённый процесс"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Процесс-потомок, производящий сжатие"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Внутренняя ошибка, не удалось создать %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Не удалось создать IPC с порождённым процессом"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Не удалось выполнить компрессор "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "декомпрессор"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "Ошибка ввода/вывода в подпроцесс/файл"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Ошибка чтения во время вычисления MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Не удалось удалить %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Не удалось переименовать %s в %s"
@@ -662,76 +651,80 @@ msgstr "Не удалось переименовать %s в %s"
 msgid "Y"
 msgstr "д"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Ошибка компиляции регулярного выражения — %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Пакеты, имеющие неудовлетворённые зависимости:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "но %s уже установлен"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "но %s будет установлен"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "но он не может быть установлен"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "но это виртуальный пакет"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "но он не установлен"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "но он не будет установлен"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " или"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "НОВЫЕ пакеты, которые будут установлены:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Пакеты, которые будут УДАЛЕНЫ:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Пакеты, которые будут оставлены в неизменном виде:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Пакеты, которые будут обновлены:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr ""
 "Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (вследствие %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -739,59 +732,59 @@ msgstr ""
 "ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n"
 "НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "обновлено %lu, установлено %lu новых пакетов, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "переустановлено %lu переустановлено, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu пакетов заменены на старые версии, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "не установлено до конца или удалено %lu пакетов.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Заметьте, выбирается «%s» для задачи «%s»\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Заметьте, выбирается «%s» для регулярного выражения «%s»\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Пакет %s — виртуальный, его функции предоставляются пакетами:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Установлен]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr " [Нет версии-кандидата]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Вы должны явно указать, какой именно вы хотите установить."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -802,151 +795,151 @@ msgstr ""
 "Это может означать, что пакет отсутствует, устарел, или доступен из "
 "источников, не упомянутых в sources.list\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Однако следующие пакеты могут его заменить:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Для пакета «%s» не найден кандидат на установку"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "Виртуальные пакеты, подобные «%s», не могут быть удалены\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Заметьте, вместо «%2$s» выбирается «%1$s»\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Пропускается %s — пакет уже установлен и нет команды upgrade.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Пропускается %s — пакет не установлен, а запрошено только обновление.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Переустановка %s невозможна, он не скачивается.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "Уже установлена самая новая версия %s.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2096 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s установлен вручную.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Выбрана версия «%s» (%s) для «%s»\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Выбрана версия «%s» (%s) для «%s» из-за «%s»\n"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Пакет %s не установлен, поэтому не может быть удалён\n"
 
-#: cmdline/apt-get.cc:969
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Исправление зависимостей…"
 
-#: cmdline/apt-get.cc:972
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " не удалось."
 
-#: cmdline/apt-get.cc:975
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Невозможно скорректировать зависимости"
 
-#: cmdline/apt-get.cc:978
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Невозможно минимизировать набор обновлений"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Готово"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 "Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
 "f install»."
 
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f."
 
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!"
 
-#: cmdline/apt-get.cc:1016
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Предупреждение об аутентификации не принято в внимание.\n"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Установить эти пакеты без проверки [y/N]? "
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Некоторые пакеты невозможно аутентифицировать"
 
-#: cmdline/apt-get.cc:1034 cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Существуют проблемы, а параметр -y указан без --force-yes"
 
-#: cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "Внутренняя ошибка, InstallPackages была вызвана с неработоспособными "
 "пакетами!"
 
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Пакеты необходимо удалить, но удаление запрещено."
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Внутренняя ошибка, Ordering не завершилась"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "Странно.. Несовпадение размеров, напишите на apt@packages.debian.org"
 
 #. 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:1140
+#: cmdline/apt-get.cc:1156
 #, 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:1145
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Необходимо скачать %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:1152
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -955,35 +948,35 @@ 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:1157
+#: cmdline/apt-get.cc:1173
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 "После данной операции, объём занятого дискового пространства уменьшится на "
 "%sB.\n"
 
-#: cmdline/apt-get.cc:1172 cmdline/apt-get.cc:1175 cmdline/apt-get.cc:2514
-#: cmdline/apt-get.cc:2517
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Не удалось определить количество свободного места в %s"
 
-#: cmdline/apt-get.cc:1185
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Недостаточно свободного места в %s."
 
-#: cmdline/apt-get.cc:1201 cmdline/apt-get.cc:1221
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "Запрошено выполнение только тривиальных операций, но это не тривиальная "
 "операция."
 
-#: cmdline/apt-get.cc:1203
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Да, делать, как я скажу!"
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -994,28 +987,28 @@ msgstr ""
 "Чтобы продолжить, введите фразу: «%s»\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1211 cmdline/apt-get.cc:1230
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Аварийное завершение."
 
-#: cmdline/apt-get.cc:1226
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Хотите продолжить [Д/н]? "
 
-#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:2579 apt-pkg/algorithms.cc:1445
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Не удалось получить %s  %s\n"
 
-#: cmdline/apt-get.cc:1316
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Некоторые файлы скачать не удалось"
 
-#: cmdline/apt-get.cc:1317 cmdline/apt-get.cc:2591
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Указан режим \"только скачивание\", и скачивание завершено"
 
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1023,19 +1016,19 @@ msgstr ""
 "Невозможно получить некоторые архивы, вероятно надо запустить apt-get update "
 "или попытаться повторить запуск с ключом --fix-missing"
 
-#: cmdline/apt-get.cc:1327
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing и смена носителя в данный момент не поддерживаются"
 
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Невозможно исправить ситуацию с пропущенными пакетами."
 
-#: cmdline/apt-get.cc:1333
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Аварийное завершение установки."
 
-#: cmdline/apt-get.cc:1361
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1052,35 +1045,35 @@ msgstr[2] ""
 "Следующие пакеты исчез из системы, так как все их файлы\n"
 "теперь берутся из других пакетов:"
 
-#: cmdline/apt-get.cc:1365
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Замечание: это сделано автоматически и специально программой dpkg."
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Игнорируется недоступный выпуск «%s» пакета «%s»"
 
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Используется «%s» в качестве исходного пакета вместо «%s»\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1573
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Игнорируется недоступная версия «%s» пакета «%s»"
 
-#: cmdline/apt-get.cc:1589
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Команде update не нужны аргументы"
 
-#: cmdline/apt-get.cc:1652
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Не предполагалось удалять stuff, невозможно запустить AutoRemover"
 
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1098,15 +1091,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1759 cmdline/apt-get.cc:1929
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "Следующая информация, возможно, поможет вам:"
 
-#: cmdline/apt-get.cc:1763
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Внутренняя ошибка, AutoRemover всё поломал"
 
-#: cmdline/apt-get.cc:1770
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1118,7 +1111,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Следующие пакеты устанавливались автоматически и больше не требуются:"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1127,21 +1120,21 @@ msgstr[0] "%lu пакет был установлен автоматически
 msgstr[1] "%lu пакета было установлено автоматически и больше не требуется.\n"
 msgstr[2] "%lu пакетов было установлены автоматически и больше не требуются.\n"
 
-#: cmdline/apt-get.cc:1776
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Для их удаления используйте «apt-get autoremove»."
 
-#: cmdline/apt-get.cc:1795
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Внутренняя ошибка, AllUpgrade всё поломал"
 
-#: cmdline/apt-get.cc:1894
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
 "f install»:"
 
-#: cmdline/apt-get.cc:1898
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1149,7 +1142,7 @@ msgstr ""
 "Неудовлетворённые зависимости. Попытайтесь выполнить «apt-get -f install», "
 "не указывая имени пакета, (или найдите другое решение)."
 
-#: cmdline/apt-get.cc:1914
+#: cmdline/apt-get.cc:1929
 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"
@@ -1160,33 +1153,33 @@ msgstr ""
 "или же используете нестабильную версию дистрибутива, где запрошенные вами\n"
 "пакеты ещё не созданы или были удалены из Incoming."
 
-#: cmdline/apt-get.cc:1932
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Сломанные пакеты"
 
-#: cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Будут установлены следующие дополнительные пакеты:"
 
-#: cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Предлагаемые пакеты:"
 
-#: cmdline/apt-get.cc:2049
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Рекомендуемые пакеты:"
 
-#: cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Не удалось найти пакет %s"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s выбран для автоматической установки.\n"
 
-#: cmdline/apt-get.cc:2106 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -1194,42 +1187,42 @@ msgstr ""
 "Эта команда устарела. Используйте вместо неё «apt-mark auto» и «apt-mark "
 "manual»."
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Расчёт обновлений…"
 
-#: cmdline/apt-get.cc:2125 methods/ftp.cc:708 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Неудачно"
 
-#: cmdline/apt-get.cc:2130
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Готово"
 
-#: cmdline/apt-get.cc:2197 cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Внутренняя ошибка, решатель проблем всё поломал"
 
-#: cmdline/apt-get.cc:2233 cmdline/apt-get.cc:2269
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы"
 
-#: cmdline/apt-get.cc:2320
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr "Выполняется загрузка %s %s"
 
-#: cmdline/apt-get.cc:2376
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Укажите как минимум один пакет, исходный код которого необходимо получить"
 
-#: cmdline/apt-get.cc:2416 cmdline/apt-get.cc:2728
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Невозможно найти пакет с исходным кодом для %s"
 
-#: cmdline/apt-get.cc:2433
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1238,7 +1231,7 @@ msgstr ""
 "ВНИМАНИЕ: упаковка «%s» поддерживается в системе контроля версий «%s»:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2438
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1249,70 +1242,70 @@ msgstr ""
 "bzr get %s\n"
 "для получения последних (возможно не выпущенных) обновлений пакета.\n"
 
-#: cmdline/apt-get.cc:2491
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускаем уже скачанный файл «%s»\n"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2548
 #, 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:2537
+#: cmdline/apt-get.cc:2557
 #, 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:2542
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Необходимо получить %sб архивов исходного кода.\n"
 
-#: cmdline/apt-get.cc:2548
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Получение исходного кода %s\n"
 
-#: cmdline/apt-get.cc:2586
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Некоторые архивы не удалось получить."
 
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2637
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n"
 
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Команда распаковки «%s» завершилась неудачно.\n"
 
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n"
 
-#: cmdline/apt-get.cc:2652
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Команда сборки «%s» завершилась неудачно.\n"
 
-#: cmdline/apt-get.cc:2672
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Порождённый процесс завершился неудачно"
 
-#: cmdline/apt-get.cc:2691
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Для проверки зависимостей для сборки необходимо указать как минимум один "
 "пакет"
 
-#: cmdline/apt-get.cc:2716
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -1321,17 +1314,17 @@ msgstr ""
 "У %s отсутствует информация об архитектуре. Для её настройки смотрите apt."
 "conf(5) APT::Architectures"
 
-#: cmdline/apt-get.cc:2733
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Невозможно получить информацию о зависимостях для сборки %s"
 
-#: cmdline/apt-get.cc:2753
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s не имеет зависимостей для сборки.\n"
 
-#: cmdline/apt-get.cc:2883
+#: cmdline/apt-get.cc:2903
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1340,7 +1333,7 @@ msgstr ""
 "Зависимость типа %s для %s не может быть удовлетворена, так как %s не "
 "разрешён для пакетов «%s»"
 
-#: cmdline/apt-get.cc:2904
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1349,14 +1342,14 @@ msgstr ""
 "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
 "найден"
 
-#: cmdline/apt-get.cc:2927
+#: cmdline/apt-get.cc:2947
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный "
 "пакет %s новее, чем надо"
 
-#: cmdline/apt-get.cc:2966
+#: cmdline/apt-get.cc:2986
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1365,7 +1358,7 @@ msgstr ""
 "Зависимость типа %s для %s не может быть удовлетворена, так как версия-"
 "кандидат пакета %s не может удовлетворить требованиям по версии"
 
-#: cmdline/apt-get.cc:2972
+#: cmdline/apt-get.cc:2992
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1374,30 +1367,30 @@ msgstr ""
 "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
 "имеет версии-кандидата"
 
-#: cmdline/apt-get.cc:2995
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
 
-#: cmdline/apt-get.cc:3011
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Зависимости для сборки %s не могут быть удовлетворены."
 
-#: cmdline/apt-get.cc:3016
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Обработка зависимостей для сборки завершилась неудачно"
 
-#: cmdline/apt-get.cc:3109 cmdline/apt-get.cc:3121
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Changelog для %s (%s)"
 
-#: cmdline/apt-get.cc:3240
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Поддерживаемые модули:"
 
-#: cmdline/apt-get.cc:3281
+#: cmdline/apt-get.cc:3301
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1489,7 +1482,7 @@ msgstr ""
 "содержится подробная информация и описание параметров.\n"
 "                       В APT есть коровья СУПЕРСИЛА.\n"
 
-#: cmdline/apt-get.cc:3444
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1501,33 +1494,33 @@ msgstr ""
 "      Учтите, что блокировка не используется,\n"
 "      поэтому нет полного соответствия с текущей реальной ситуацией!"
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "В кэше "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Получено:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Игн "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Ош  "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Получено %sБ за %s (%sБ/c)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Обработка]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1538,47 +1531,63 @@ msgstr ""
 " «%s»\n"
 "в устройство «%s» и нажмите ввод\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s не может быть помечен, так он не установлен.\n"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s уже помечен как установленный вручную.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s уже помечен как установленный автоматически.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s уже помечен как зафиксированный.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s уже помечен как не зафиксированный.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s помечен как зафиксированный.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Отмена фиксации для %s.\n"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 "Выполнение dpkg завершилось с ошибкой. У вас есть права суперпользователя?"
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1621,11 +1630,11 @@ msgstr ""
 "В справочных страницах apt-mark(8) и apt.conf(5)\n"
 "содержится подробная информация и описание параметров."
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Запись о неизвестном пакете!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1688,196 +1697,198 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Слияние доступной информации"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Не удалось создать каналы"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Не удалось выполнить gzip "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Повреждённый архив"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Неправильная контрольная сумма Tar, архив повреждён"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Неизвестный заголовок в архиве TAR. Тип %u, элемент %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Неверная сигнатура архива"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Ошибка чтения заголовка элемента архива"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "Неправильный заголовок элемента архива %s"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Неправильный заголовок элемента архива"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Слишком короткий архив"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Не удалось прочитать заголовки архива"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "DropNode вызван для узла, который ещё используется"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Не удалось найти элемент хеша!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Не удалось создать diversion"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Внутренняя ошибка в AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Попытка изменения diversion, %s -> %s и %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Двойное добавление diversion %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Повторно указан файл настройки %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Не удалось записать в файл %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Не удалось закрыть файл %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Слишком длинный путь %s"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Повторная распаковка %s"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Каталог %s входит в список diverted"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Пакет пытается писать в diversion %s/%s"
 
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Путь diversion слишком длинен"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Каталог %s был заменён не-каталогом"
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "Не удалось разместить узел в хеше"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Путь слишком длинен"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Файлы заменяются содержимым пакета %s без версии"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Файл %s/%s переписывает файл в пакете %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:454 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:353
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Невозможно прочитать %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Невозможно получить атрибуты %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Не удалось удалить %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Не удалось создать %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Не удалось получить атрибуты %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Каталоги info и temp должны находиться на одной файловой системе"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1063
-#: apt-pkg/pkgcachegen.cc:1167 apt-pkg/pkgcachegen.cc:1173
-#: apt-pkg/pkgcachegen.cc:1335
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Чтение списков пакетов"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Не удалось сменить текущий каталог на административный каталог %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Внутренняя ошибка при получении имени пакета"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Чтение списков файлов в пакете"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1888,114 +1899,115 @@ msgstr ""
 "восстановить этот файл, то обнулите его и немедленно переустановите ту же "
 "версию пакета!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Ошибка чтения списка файлов %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Внутренняя ошибка при получении node"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Не удалось открыть файл diversions %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "Файл diversions повреждён"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Неверная строка в файле diversions: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Внутренняя ошибка при добавлении diversion"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "В первую очередь должен быть инициализирован кэш пакетов"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Не удалось найти заголовок Package:, смещение %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Неверная секция ConfFile в status-файле. Смещение %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Ошибка чтения контрольной суммы. Смещение %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Это неправильный DEB-архив — отсутствует составная часть «%s»"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 "Это неправильный DEB-архив — отсутствует составная часть «%s», «%s» или «%s»"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Не удалось перейти в каталог %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Внутренняя ошибка, не удалось найти составную часть %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Не удалось найти правильный control-файл"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Не удалось прочесть содержимое control-файла"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr "Пустые файлы не могут быть допустимыми архивами"
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Не удалось открыть канал для %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Ошибка чтения из процесса %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:527
-#: methods/rred.cc:536
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Не удалось получить атрибуты"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:533
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Не удалось установить время модификации"
 
-#: methods/cdrom.cc:200
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Невозможно прочесть базу %s с CD"
 
-#: methods/cdrom.cc:209
+#: 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"
@@ -2003,56 +2015,56 @@ msgstr ""
 "Пожалуйста, используйте apt-cdrom, чтобы APT смог распознать данный CD. apt-"
 "get update не используется для добавления нового CD"
 
-#: methods/cdrom.cc:219
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "Ошибочный CD"
 
-#: methods/cdrom.cc:246
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Невозможно размонтировать CD-ROM в %s, возможно он ещё используется."
 
-#: methods/cdrom.cc:251
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Диск не найден."
 
-#: methods/cdrom.cc:259 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Файл не найден"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Неправильный URI, локальный URI не должен начинаться с //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:169
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Вход в систему"
 
-#: methods/ftp.cc:175
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Невозможно определить имя удалённого сервера"
 
-#: methods/ftp.cc:180
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Невозможно определить локальное имя"
 
-#: methods/ftp.cc:211 methods/ftp.cc:239
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Сервер разорвал соединение и сообщил: %s"
 
-#: methods/ftp.cc:217
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Команда USER не выполнена, сервер сообщил: %s"
 
-#: methods/ftp.cc:224
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Команда PASS не выполнена, сервер сообщил: %s"
 
-#: methods/ftp.cc:244
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2060,202 +2072,202 @@ msgstr ""
 "Proxy-сервер указан, однако нет сценария входа в систему, Acquire::ftp::"
 "ProxyLogin пуст."
 
-#: methods/ftp.cc:272
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 "Команда «%s» сценария входа в систему завершилась неудачно, сервер сообщил: "
 "%s"
 
-#: methods/ftp.cc:298
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Команда TYPE не выполнена, сервер сообщил: %s"
 
-#: methods/ftp.cc:336 methods/ftp.cc:447 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Допустимое время ожидания для соединения истекло"
 
-#: methods/ftp.cc:342
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Сервер прервал соединение"
 
-#: methods/ftp.cc:345 apt-pkg/contrib/fileutl.cc:831 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Ошибка чтения"
 
-#: methods/ftp.cc:352 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Ответ переполнил буфер."
 
-#: methods/ftp.cc:369 methods/ftp.cc:381
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Искажение протокола"
 
-#: methods/ftp.cc:453 apt-pkg/contrib/fileutl.cc:873 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Ошибка записи"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Не удалось создать сокет"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Не удалось присоединиться к сокету данных, время на установление соединения "
 "истекло"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Невозможно присоединить пассивный сокет"
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Вызов getaddrinfo не смог получить сокет"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Невозможно присоединиться к сокету"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Не удалось принимать соединения на сокете"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Не удалось определить имя сокета"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Невозможно послать команду PORT"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Неизвестное семейство адресов %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Команда EPRT не выполнена, сервер сообщил: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Время установления соединения для сокета данных истекло"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Невозможно принять соединение"
 
-#: methods/ftp.cc:870 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Проблема при хешировании файла"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Невозможно получить файл, сервер сообщил: «%s»"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Время ожидания соединения для сокета данных истекло"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Передача данных завершилась неудачно, сервер сообщил: «%s»"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Запрос"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Невозможно вызвать "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Соединение с %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Невозможно инициализировать соединение с %s:%s (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Не удаётся соединиться с %s:%s (%s), connection timed out"
 
-#: methods/connect.cc:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Соединение с %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Не удалось найти IP-адрес для «%s»"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Временная ошибка при попытке получить IP-адрес «%s»"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Что-то странное произошло при определении «%s:%s» (%i - %s)"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Невозможно соединиться с %s: %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток "
 "ключа?!"
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Найдена как минимум одна неправильная подпись."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "Не удалось выполнить «gpgv» для проверки подписи (gpgv установлена?)"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Неизвестная ошибка при выполнении gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Следующие подписи неверные:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2263,106 +2275,111 @@ msgstr ""
 "Следующие подписи не могут быть проверены, так как недоступен открытый "
 "ключ:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Ожидание заголовков"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Получен заголовок длиннее %u символов"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Неверный заголовок"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http-сервер послал неверный заголовок"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http сервер послал неверный заголовок Content-Length"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http-сервер послал неверный заголовок Content-Range"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Этот HTTP-сервер не поддерживает скачивание фрагментов файлов"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Неизвестный формат данных"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Ошибка в select"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Время ожидания для соединения истекло"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Ошибка записи в выходной файл"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Ошибка записи в файл"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Ошибка записи в файл"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Ошибка чтения, удалённый сервер прервал соединение"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Ошибка чтения с сервера"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Не удалось обрезать файл"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Неверный заголовок данных"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Соединение разорвано"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Невозможно отобразить в память пустой файл"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Не удалось сделать копию файлового дескриптора %i"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Невозможно отобразить в память %lu байт"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "Не удалось закрыть mmap"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "Не удалось синхронизировать mmap"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Невозможно отобразить в память %lu байт"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Не удалось обрезать файл"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2371,7 +2388,7 @@ msgstr ""
 "Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Limit. "
 "Текущее значение: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2379,7 +2396,7 @@ msgid ""
 msgstr ""
 "Не удалось увеличить размер MMap, так как уже достигнут предел в %lu байт."
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2410,182 +2427,182 @@ msgstr "%liмин %liс"
 msgid "%lis"
 msgstr "%liс"
 
-#: apt-pkg/contrib/strutl.cc:1137
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Не найдено: %s"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Неизвестная аббревиатура типа: «%c»"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Открытие файла настройки %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Синтаксическая ошибка %s:%u: в начале блока нет имени."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Синтаксическая ошибка %s:%u: искажённый тег"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Синтаксическая ошибка %s:%u: лишние символы после значения"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Синтаксическая ошибка %s:%u: директивы могут задаваться только на верхнем "
 "уровне"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Синтаксическая ошибка %s:%u: слишком много вложенных include"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Синтаксическая ошибка %s:%u вызвана include из этого места"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Синтаксическая ошибка %s:%u: не поддерживаемая директива «%s»"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Синтаксическая ошибка %s:%u: для директивы clear требуется третий параметр в "
 "качестве аргумента"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Синтаксическая ошибка %s:%u: лишние символы в конце файла"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s… Ошибка!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s… Готово"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Неизвестный параметр командной строки «%c» [из %s]."
 
-#: apt-pkg/contrib/cmndline.cc:101 apt-pkg/contrib/cmndline.cc:109
-#: apt-pkg/contrib/cmndline.cc:117
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Не распознанный параметр командной строки %s"
 
-#: apt-pkg/contrib/cmndline.cc:122
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Параметр командной строки %s — не логический переключатель \"да/нет\""
 
-#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Для параметра %s требуется аргумент."
 
-#: apt-pkg/contrib/cmndline.cc:197 apt-pkg/contrib/cmndline.cc:203
+#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Значение параметра %s должно иметь вид =<val>."
 
-#: apt-pkg/contrib/cmndline.cc:232
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Для параметра %s требуется аргумент в виде целого числа, а не «%s»"
 
-#: apt-pkg/contrib/cmndline.cc:263
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Параметр «%s» слишком длинный"
 
-#: apt-pkg/contrib/cmndline.cc:295
+#: apt-pkg/contrib/cmndline.cc:298
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr "Смысл %s не ясен, используйте true или false."
 
-#: apt-pkg/contrib/cmndline.cc:345
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Неверная операция %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Невозможно прочитать атрибуты точки монтирования %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:460 apt-pkg/acquire.cc:485 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Невозможно сменить текущий каталог на %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Невозможно получить атрибуты cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Блокировка не используется, так как файл блокировки %s доступен только для "
 "чтения"
 
-#: apt-pkg/contrib/fileutl.cc:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Не удалось открыть файл блокировки %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Блокировка не используется, так как файл блокировки %s находится на файловой "
 "системе nfs"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Не удалось получить доступ к файлу блокировки %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr "Список файлов не может быть создан, так как «%s» не является каталогом"
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr "Файл «%s» в каталоге «%s» игнорируется, так как это необычный файл"
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr "Файл «%s» в каталоге «%s» игнорируется, так как он не имеет расширения"
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
@@ -2593,265 +2610,278 @@ msgstr ""
 "Файл «%s» в каталоге «%s» игнорируется, так как он не имеет неправильное "
 "расширение"
 
-#: apt-pkg/contrib/fileutl.cc:690
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Ожидалось завершение процесса %s, но он не был запущен"
 
-#: apt-pkg/contrib/fileutl.cc:702
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 "Нарушение защиты памяти (segmentation fault) в порождённом процессе %s."
 
-#: apt-pkg/contrib/fileutl.cc:704
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Порождённый процесс %s получил сигнал %u."
 
-#: apt-pkg/contrib/fileutl.cc:708
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Порождённый процесс %s вернул код ошибки (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:710
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Порождённый процесс %s неожиданно завершился"
 
-#: apt-pkg/contrib/fileutl.cc:775 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Не удалось открыть файл %s"
 
-#: apt-pkg/contrib/fileutl.cc:792
+#: apt-pkg/contrib/fileutl.cc:923
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Не удалось открыть файловый дескриптор %d"
 
-#: apt-pkg/contrib/fileutl.cc:852
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Не удалось создать IPC с порождённым процессом"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Не удалось выполнить компрессор "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr ""
 "ошибка при чтении. собирались прочесть ещё %lu байт, но ничего больше нет"
 
-#: apt-pkg/contrib/fileutl.cc:885
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "ошибка при записи, собирались записать ещё %lu байт, но не смогли"
 
-#: apt-pkg/contrib/fileutl.cc:1021
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Проблема закрытия gzip-файла %s"
 
-#: apt-pkg/contrib/fileutl.cc:1024
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Проблема закрытия файла %s"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1419
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Проблема при переименовании файла %s в %s"
 
-#: apt-pkg/contrib/fileutl.cc:1040
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Проблема при удалении файла %s"
 
-#: apt-pkg/contrib/fileutl.cc:1053
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Проблема при синхронизации файла"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Кэш пакетов пуст"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Кэш пакетов повреждён"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "Не поддерживаемая версия кэша пакетов"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Кэш пакетов повреждён"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Эта версия APT не поддерживает систему версий «%s»"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "Кэш пакетов был собран для другой архитектуры"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Зависит"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "ПредЗависит"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Предлагает"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Рекомендует"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Конфликтует"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Заменяет"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Замещает"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Ломает"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "Улучшает"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "важный"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "необходимый"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "стандартный"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "необязательный"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "дополнительный"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Построение дерева зависимостей"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Версии-кандидаты"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Генерирование зависимостей"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Чтение информации о состоянии"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Не удалось открыть StateFile %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Не удалось записать временный StateFile %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Невозможно разобрать содержимое пакета %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Невозможно разобрать содержимое пакета %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "Искажённая строка %lu в списке источников %s ([параметр] неразбираем)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 "Искажённая строка %lu в списке источников %s ([параметр] слишком короткий)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Искажённая строка %lu в списке источников %s (([%s] не назначаем)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Искажённая строка %lu в списке источников %s ([%s] не имеет ключа)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 "Искажённая строка %lu в списке источников %s (([%s] ключ %s не имеет "
 "значения)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 "Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Искажённая строка %lu в списке источников %s (absolute dist)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Искажённая строка %lu в списке источников %s (dist parse)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Открытие %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Строка %u в списке источников %s слишком длинна."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Искажённая строка %u в списке источников %s (тип)"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
 
-#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:645
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2860,7 +2890,12 @@ msgstr ""
 "Не удалось выполнить оперативную настройку «%s». Подробней, смотрите в man 5 "
 "apt.conf о APT::Immediate-Configure. (%d)"
 
-#: apt-pkg/packagemanager.cc:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Не удалось открыть файл «%s»"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2873,28 +2908,19 @@ msgstr ""
 "Если вы действительно хотите продолжить, установите параметр APT::Force-"
 "LoopBreak."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"Не удалось выполнить оперативную настройку уже распакованного «%s». "
-"Подробней, смотрите в man 5 apt.conf о APT::Immediate-Configure."
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Не поддерживается индексный файл типа «%s»"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 "Пакет %s нуждается в переустановке, но найти архив для него не удалось."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2902,11 +2928,11 @@ msgstr ""
 "Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это "
 "может быть вызвано отложенными (held) пакетами."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты."
 
-#: apt-pkg/algorithms.cc:1471 apt-pkg/algorithms.cc:1473
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2914,79 +2940,79 @@ msgstr ""
 "Некоторые индексные файлы не скачались. Они были проигнорированы или вместо "
 "них были использованы старые версии."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Каталог списка %spartial отсутствует."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Архивный каталог %spartial отсутствует."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "Невозможно заблокировать каталог %s"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:861
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Скачивается файл %li из %li (осталось %s)"
 
-#: apt-pkg/acquire.cc:863
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Скачивается файл %li из %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Драйвер для метода %s не найден."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Метод %s запустился не корректно"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Вставьте диск с меткой «%s» в устройство «%s» и нажмите ввод."
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Система пакетирования «%s» не поддерживается"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Невозможно определить подходящий тип системы пакетирования"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Невозможно получить атрибуты %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Вы должны заполнить sources.list, поместив туда URI источников пакетов"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Списки пакетов или файл состояния не могут быть открыты или прочитаны."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Вы можете запустить «apt-get update» для исправления этих ошибок"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Не читается перечень источников."
 
-#: apt-pkg/policy.cc:72
+#: apt-pkg/policy.cc:74
 #, c-format
 msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
@@ -2995,125 +3021,87 @@ msgstr ""
 "Значение «%s» недопустимо для APT::Default-Release, так как выпуск "
 "недоступен в источниках"
 
-#: apt-pkg/policy.cc:390
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Неверная запись в файле параметров %s: отсутствует заголовок Package"
 
-#: apt-pkg/policy.cc:412
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Неизвестный тип фиксации %s"
 
-#: apt-pkg/policy.cc:420
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Для фиксации не указан приоритет (или указан нулевой)"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Кэш имеет несовместимую систему версий"
 
-#: apt-pkg/pkgcachegen.cc:190
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Произошла ошибка во время обработки %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:207
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Произошла ошибка во время обработки %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:245
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Произошла ошибка во время обработки %s (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:277
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Произошла ошибка во время обработки %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:281
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Произошла ошибка во время обработки %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:298 apt-pkg/pkgcachegen.cc:308
-#: apt-pkg/pkgcachegen.cc:316
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Произошла ошибка во время обработки %s (NewVersion%d)"
-
-#: apt-pkg/pkgcachegen.cc:312
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Произошла ошибка во время обработки %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:345
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Произошла ошибка во время обработки %s (NewFileDesc2)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Произошла ошибка во время обработки %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Превышено допустимое количество имён пакетов."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Превышено допустимое количество версий."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Вах, превышено допустимое количество описаний, с которым может работать APT."
 
-#: apt-pkg/pkgcachegen.cc:360
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Превышено допустимое количество зависимостей."
 
-#: apt-pkg/pkgcachegen.cc:389
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Произошла ошибка во время обработки %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:403
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Произошла ошибка во время обработки %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:517
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Во время обработки файла зависимостей не найден пакет %s %s"
 
-#: apt-pkg/pkgcachegen.cc:975
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s"
 
-#: apt-pkg/pkgcachegen.cc:1080
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Сбор информации о Provides"
 
-#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1281
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "переименовать не удалось, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum не совпадает"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1847
-#: apt-pkg/acquire-item.cc:1990
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Хеш сумма не совпадает"
 
-#: apt-pkg/acquire-item.cc:1387
+#: apt-pkg/acquire-item.cc:1399
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3122,16 +3110,16 @@ msgstr ""
 "Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись "
 "в sources.list или файл)"
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1415
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Невозможно найти хеш-сумму «%s» в файле Release"
 
-#: apt-pkg/acquire-item.cc:1438
+#: apt-pkg/acquire-item.cc:1450
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Недоступен открытый ключ для следующих ID ключей:\n"
 
-#: apt-pkg/acquire-item.cc:1476
+#: apt-pkg/acquire-item.cc:1488
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3140,12 +3128,12 @@ msgstr ""
 "Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого "
 "репозитория производиться не будет."
 
-#: apt-pkg/acquire-item.cc:1498
+#: apt-pkg/acquire-item.cc:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)"
 
-#: apt-pkg/acquire-item.cc:1531
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3155,12 +3143,12 @@ msgstr ""
 "использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1541 apt-pkg/acquire-item.cc:1546
+#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Ошибка GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1638
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3169,7 +3157,7 @@ msgstr ""
 "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
 "вручную исправить этот пакет (возможно, пропущен arch)"
 
-#: apt-pkg/acquire-item.cc:1697
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3178,47 +3166,47 @@ msgstr ""
 "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
 "вручную исправить этот пакет."
 
-#: apt-pkg/acquire-item.cc:1752
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
 
-#: apt-pkg/acquire-item.cc:1839
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Не совпадает размер"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Невозможно разобрать содержимое файла Release (%s)"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Отсутствуют разделы в файле Release (%s)"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Отсутствуют элементы Hash в файле Release (%s)"
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Неправильный элемент «Valid-Until» в файле Release %s"
 
-#: apt-pkg/indexrecords.cc:129
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Неправильный элемент «Date» в файле Release %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Блок поставщика %s не содержит отпечатка (fingerprint)"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3227,41 +3215,41 @@ msgstr ""
 "В качестве точки монтирования CD-ROM используется %s\n"
 "Монтируется CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Идентификация.. "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Найдена метка: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "Размонтирование CD-ROM…\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Использование %s в качестве точки монтирования CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Размонтирование CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Ожидание операции работы с диском…\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Монтирование CD-ROM…\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Поиск на диске индексных файлов..\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3270,7 +3258,7 @@ msgstr ""
 "Найдено индексов: %zu для пакетов, %zu для источников, %zu для переводов и "
 "%zu для сигнатур\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3278,16 +3266,16 @@ msgstr ""
 "Не удалось найти ни одного файла пакетов; возможно это не диск Debian или с "
 "не той архитектурой?"
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Найден ярлык «%s»\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Это неправильное имя, попробуйте ещё раз.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3296,93 +3284,93 @@ msgstr ""
 "Название диска: \n"
 "«%s»\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Копирование списков пакетов…"
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Запись нового списка источников\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "Записи в списке источников для этого диска:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:927
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Сохранено %i записей.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:929
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Сохранено %i записей с %i отсутствующими файлами.\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Сохранено %i записей с %i несовпадающими файлами\n"
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Сохранено %i записей с %i отсутствующими файлами и с %i несовпадающими "
 "файлами\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Пропускается несуществующий файл %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Не удалось найти аутентификационную запись для: %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Не совпадает хеш сумма для: %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "Связка ключей в %s не установлена."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Выпуск «%s» для «%s» не найден"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Версия «%s» для «%s» не найдена"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Не удалось найти задачу «%s»"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Не удалось найти пакет по регулярному выражению «%s»"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Не удалось выбрать версии из пакета «%s», так как он полностью виртуальный"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3391,128 +3379,152 @@ msgstr ""
 "Не удалось выбрать ни установленную, ни версию кандидата из пакета «%s», так "
 "как в нём нет ни той, ни другой"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Не удалось выбрать самую новую версию из пакета «%s», так как он полностью "
 "виртуальный"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Не удалось выбрать самую версию кандидата из пакета %s, так как у него нет "
 "кандидатов"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Не удалось выбрать установленную версию из пакета %s, так как он не "
 "установлен"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "Устанавливается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Настраивается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Удаляется %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "Выполняется полное удаление %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Уведомление об исчезновении %s"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Выполняется послеустановочный триггер %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Отсутствует каталог «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Не удалось открыть файл «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Подготавливается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Распаковывается %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Подготавливается для настройки %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "Установлен %s"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Подготавливается для удаления %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "Удалён %s"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Подготовка к полному удалению %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s полностью удалён"
 
-#: apt-pkg/deb/dpkgpm.cc:1087
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Не удалось записать в журнал, неудачное выполнение openpty() (/dev/pts не "
 "смонтирован?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1118
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "Запускается dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1344
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1349
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "проблемы с зависимостями — оставляем ненастроенным"
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3520,7 +3532,7 @@ msgstr ""
 "Отчёты apport не записаны, так как сообщение об ошибке указывает на "
 "повторную ошибку от предыдущего отказа."
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3528,7 +3540,7 @@ msgstr ""
 "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
 "места на диске"
 
-#: apt-pkg/deb/dpkgpm.cc:1363
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3536,14 +3548,14 @@ msgstr ""
 "Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
 "памяти"
 
-#: apt-pkg/deb/dpkgpm.cc:1370
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Отчёты apport не записаны, так как получено сообщение об ошибке об ошибке "
 "ввода-выводы dpkg"
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3552,7 +3564,7 @@ msgstr ""
 "Не удалось выполнить блокировку управляющего каталога (%s); он уже "
 "используется другим процессом?"
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
@@ -3561,7 +3573,7 @@ msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
@@ -3569,30 +3581,30 @@ msgstr ""
 "Работа dpkg прервана, вы должны вручную запустить «%s» для устранения "
 "проблемы. "
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Не заблокирован"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "Файл «%s» не найден на зеркале"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Невозможно прочитать файл на зеркале «%s»"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Зеркало: %s]"
 
-#: methods/rred.cc:506
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3601,7 +3613,7 @@ msgstr ""
 "Не удалось наложить заплату %s с использованием mmap и файловой операции — "
 "вероятно, повреждена заплата."
 
-#: methods/rred.cc:511
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3610,10 +3622,69 @@ msgstr ""
 "Не удалось наложить заплату %s с использованием mmap (но не из-за mmap) — "
 "вероятно, повреждена заплата."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Соединение закрыто преждевременно"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Замечание: это сделано автоматически и специально программой dpkg."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Неправильная запись о переназначении (override) %s на строке %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Неправильная запись о переназначении (override) %s на строке %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Неправильная запись о переназначении (override) %s на строке %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "декомпрессор"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr ""
+#~ "ошибка при чтении. собирались прочесть ещё %lu байт, но ничего больше нет"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "ошибка при записи, собирались записать ещё %lu байт, но не смогли"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "Не удалось выполнить оперативную настройку уже распакованного «%s». "
+#~ "Подробней, смотрите в man 5 apt.conf о APT::Immediate-Configure."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Произошла ошибка во время обработки %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Произошла ошибка во время обработки %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Произошла ошибка во время обработки %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Произошла ошибка во время обработки %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Произошла ошибка во время обработки %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Произошла ошибка во время обработки %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Произошла ошибка во время обработки %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Произошла ошибка во время обработки %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Произошла ошибка во время обработки %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Произошла ошибка во время обработки %s (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Внутренняя ошибка, не удалось найти составную часть"
 
diff --git a/po/sk.po b/po/sk.po
index 63e401449..d97bbf3e0 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-14 12:59+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+0200\n"
 "PO-Revision-Date: 2011-12-22 14:58+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -20,151 +20,152 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Balík %s verzie %s má nesplnené závislosti:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Celkom názvov balíkov: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Celkom štruktúr balíkov: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Normálnych balíkov: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Čisto virtuálnych balíkov: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Jednoduchých virtuálnych balíkov: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Zmiešaných virtuálnych balíkov: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Chýbajúcich: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Celkom rôznych verzií: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Celkom rôznych popisov: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Celkom závislostí: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Celkom vzťahov ver/súbor: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Celkom vzťahov popis/súbor: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Celkom poskytnutých mapovaní: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Celkom globovaných reťazcov: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Celkom miesta závislých verzií: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Celkom jalového miesta: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Celkom priradeného miesta: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Súbor balíkov %s je neaktuálny."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Neboli nájdené žiadne balíky"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "Musíte zadať aspoň jeden vyhľadávací vzor"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 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:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nedá sa nájsť balík %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Súbory balíka:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Pripevnené balíky:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(nenájdené)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Nainštalovaná verzia: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Kandidát: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(žiadna)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Pripevnený balík:"
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Tabuľka verzií:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3235 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -235,28 +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:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 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:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Pripojenie „%s“ na „%s“ zlyhalo"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Zopakujte tento postup pre všetky CD v sade diskov."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Argumenty nie sú vo dvojiciach"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -284,12 +285,12 @@ 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:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s nie je platný balík DEB."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -313,40 +314,40 @@ 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:267 apt-pkg/pkgcachegen.cc:1164
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Do %s sa nedá zapisovať"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Nedá sa určiť verzia programu debconf. Je debconf nainštalovaný?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Zoznam rozšírení balíka je príliš dlhý"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Chyba pri spracovávaní adresára %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Zoznam zdrojových rozšírení je príliš dlhý"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Chyba pri zapisovaní hlavičky do súboru"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Chyba pri spracovávaní obsahu %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -426,26 +427,26 @@ msgstr ""
 "  -c=?  Načíta tento konfiguračný súbor\n"
 "  -o=?  Nastaví ľubovoľnú voľbu"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Nevyhovel žiaden výber"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "V súbore balíka skupiny „%s“ chýbajú niektoré súbory"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "DB je narušená, súbor je premenovaný na %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -453,111 +454,111 @@ msgstr ""
 "Formát DB je neplatný. Ak ste aktualizovali staršiu verziu apt, musíte "
 "odstrániť a znovu vytvoriť databázu."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Nedá sa otvoriť DB súbor %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s sa nedá vyhodnotiť"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Archív nemá riadiaci záznam"
 
-#: ftparchive/cachedb.cc:452
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Nedá sa získať kurzor"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Adresár %s sa nedá čítať\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: %s sa nedá vyhodnotiť\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: Chyby sa týkajú súboru "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Chyba pri preklade %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Prechod stromom zlyhal"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "%s sa nedá otvoriť"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " Odlinkovanie %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Nie je možné vykonať readlink %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Nie je možné vykonať unlink %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Nepodarilo sa zlinkovať %s s %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Bol dosiahnutý odlinkovací limit %sB.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Archív neobsahuje pole „package“"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr " %s nemá žiadnu položku override\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  správcom %s je %s, nie %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr " %s nemá žiadnu položku „source override“\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr " %s nemá žiadnu položku „binary override“\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Zlyhal pokus o pridelenie pamäti"
 
@@ -567,18 +568,18 @@ msgid "Unable to open %s"
 msgstr "Nedá sa otvoriť %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Skomolený „override“ %s riadok %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Skomolený „override“ %s riadok %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Skomolený „override“ %s riadok %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -586,63 +587,51 @@ msgstr "Skomolený „override“ %s riadok %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "Nepodarilo sa prečítať „override“ súbor %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Neznámy kompresný algoritmus „%s“"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Komprimovaný výstup %s potrebuje kompresnú sadu"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Zlyhalo vytvorenie IPC rúry k podprocesu"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Zlyhalo vytvorenie FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Volanie fork() zlyhalo"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Komprimovať potomka"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Vnútorná chyba, nepodarilo sa vytvoriť %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Nedá sa vytvoriť podproces IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Nepodarilo sa spustiť kompresor "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "dekompresor"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "V/V operácia s podprocesom/súborom zlyhala"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Chyba čítania pri výpočte MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Problém s odlinkovaním %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Premenovanie %s na %s zlyhalo"
@@ -651,75 +640,79 @@ msgstr "Premenovanie %s na %s zlyhalo"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Chyba pri preklade regulárneho výrazu - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Nasledovné balíky majú nesplnené závislosti:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "ale nainštalovaný je %s"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ale inštalovať sa bude %s"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "ale sa nedá nainštalovať"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "ale je to virtuálny balík"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "ale nie je nainštalovaný"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "ale sa nebude inštalovať"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " alebo"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Nainštalujú sa nasledovné NOVÉ balíky:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Nasledovné balíky sa ODSTRÁNIA:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Nasledovné balíky sa aktualizujú:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Nasledovné balíky sa DEGRADUJÚ:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Nasledovné pridržané balíky sa zmenia:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (kvôli %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -727,59 +720,59 @@ msgstr ""
 "UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n"
 "Ak presne neviete, čo robíte, tak to NEROBTE!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu aktualizovaných, %lu nových nainštalovaných, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinštalovaných, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu degradovaných, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu na odstránenie a %lu neaktualizovaných.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Poznámka: vyberá sa „%s“ pre úlohu „%s“\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Poznámka: vyberá sa „%s“ pre regulárny výraz „%s“\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Balík %s je virtuálny balík poskytovaný balíkmi:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Nainštalovaný]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr " [Nie je kandidátska verzia]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Mali by ste explicitne vybrať jeden na inštaláciu."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -789,127 +782,127 @@ msgstr ""
 "Balík %s nie je dostupný, ale odkazuje naň iný balík. Možno to znamená,\n"
 "že balík chýba, bol zrušený alebo je dostupný iba z iného zdroja\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Avšak nahrádzajú ho nasledovné balíky:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Balík „%s“ nemá kandidáta na inštaláciu"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "Virtuálne balíky ako „%s“ nemožno odstrániť\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Poznámka: „%s“ sa vyberá namiesto „%s“\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Preskakuje sa %s, pretože je už nainštalovaný.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Preskakuje sa %s, nie je nainštalovaný a bola vy6iadan8 iba aktualizácia.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Nie je možná reinštalácia %s, pretože sa nedá stiahnuť.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s je už najnovšej verzie.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2096 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s je označený ako manuálne nainštalovaný.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Vybraná verzia „%s“ (%s) pre „%s“\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Vybraná verzia „%s“ (%s) pre „%s“ kvôli „%s“\n"
 
-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Balík %s nie je nainštalovaný, nedá sa teda odstrániť\n"
 
-#: cmdline/apt-get.cc:969
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Opravujú sa závislosti..."
 
-#: cmdline/apt-get.cc:972
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " zlyhalo."
 
-#: cmdline/apt-get.cc:975
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Závislosti sa nedajú opraviť"
 
-#: cmdline/apt-get.cc:978
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Sada na aktualizáciu sa nedá minimalizovať"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Hotovo"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“."
 
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nesplnené závislosti. Skúste použiť -f."
 
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!"
 
-#: cmdline/apt-get.cc:1016
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Upozornenie o vierohodnosti bolo potlačené.\n"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Nainštalovať tieto nekontrolované balíky [y/N]? "
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov"
 
-#: cmdline/apt-get.cc:1034 cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Nastali problémy a -y bolo použité bez --force-yes"
 
-#: cmdline/apt-get.cc:1075
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!"
 
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá."
 
-#: cmdline/apt-get.cc:1095
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Vnútorná chyba, Triedenie sa neukončilo"
 
-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Nezvyčajná udalosť... Veľkosti nesúhlasia, pošlite e-mail na apt@packages."
@@ -917,52 +910,52 @@ 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:1140
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Je potrebné stiahnuť %sB/%sB 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:1145
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Je potrebné stiahnuť %sB 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:1152
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Po tejto operácii sa na disku použije ďalších %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:1157
+#: cmdline/apt-get.cc:1173
 #, c-format
 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:1172 cmdline/apt-get.cc:1175 cmdline/apt-get.cc:2514
-#: cmdline/apt-get.cc:2517
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"
 
-#: cmdline/apt-get.cc:1185
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Na %s nemáte dostatok voľného miesta."
 
-#: cmdline/apt-get.cc:1201 cmdline/apt-get.cc:1221
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Zadané „iba triviálne“, ale toto nie je triviálna operácia."
 
-#: cmdline/apt-get.cc:1203
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Áno, urob to, čo vravím!"
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -973,28 +966,28 @@ msgstr ""
 "Ak chcete pokračovať, opíšte frázu „%s“\n"
 " ?]"
 
-#: cmdline/apt-get.cc:1211 cmdline/apt-get.cc:1230
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Prerušené."
 
-#: cmdline/apt-get.cc:1226
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Chcete pokračovať [Y/n]? "
 
-#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:2579 apt-pkg/algorithms.cc:1445
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Zlyhalo stiahnutie %s  %s\n"
 
-#: cmdline/apt-get.cc:1316
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Niektoré súbory sa nedajú stiahnuť"
 
-#: cmdline/apt-get.cc:1317 cmdline/apt-get.cc:2591
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Sťahovanie ukončené v režime „iba stiahnuť“"
 
-#: cmdline/apt-get.cc:1323
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1002,19 +995,19 @@ msgstr ""
 "Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --"
 "fix-missing"
 
-#: cmdline/apt-get.cc:1327
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing a výmena nosiča nie sú momentálne podporované"
 
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Chýbajúce balíky sa nedajú opraviť."
 
-#: cmdline/apt-get.cc:1333
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Inštalácia sa prerušuje."
 
-#: cmdline/apt-get.cc:1361
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1031,35 +1024,35 @@ msgstr[2] ""
 "Nasledovné balíky zmizli z vášho systému, pretože\n"
 "všetky súbory boli prepísané inými balíkmi:"
 
-#: cmdline/apt-get.cc:1365
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Pozn.: Toto robí dpkg automaticky a zámerne."
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Ignorovať nedostupné cieľové vydanie „%s“ balíka „%s“"
 
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Vyberá sa „%s“ ako zdrojový balík namiesto „%s“\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1573
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Ignorovať nedostupnú verziu „%s“ balíka „%s“"
 
-#: cmdline/apt-get.cc:1589
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Príkaz update neprijíma žiadne argumenty"
 
-#: cmdline/apt-get.cc:1652
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nemajú sa odstraňovať veci, nespustí sa AutoRemover"
 
-#: cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1077,15 +1070,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1759 cmdline/apt-get.cc:1929
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 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:"
 
-#: cmdline/apt-get.cc:1763
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Vnútorná chyba, AutoRemover niečo pokazil"
 
-#: cmdline/apt-get.cc:1770
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1098,7 +1091,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1110,19 +1103,19 @@ msgstr[1] ""
 msgstr[2] ""
 "%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n"
 
-#: cmdline/apt-get.cc:1776
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Na ich odstránenie použite „apt-get autoremove“."
 
-#: cmdline/apt-get.cc:1795
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
 
-#: cmdline/apt-get.cc:1894
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“:"
 
-#: cmdline/apt-get.cc:1898
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1130,7 +1123,7 @@ msgstr ""
 "Nesplnené závislosti. Skúste spustiť „apt-get -f install“ bez balíkov (alebo "
 "navrhnite riešenie)."
 
-#: cmdline/apt-get.cc:1914
+#: cmdline/apt-get.cc:1929
 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"
@@ -1142,33 +1135,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:1932
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Poškodené balíky"
 
-#: cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Nainštalujú sa nasledovné extra balíky:"
 
-#: cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Navrhované balíky:"
 
-#: cmdline/apt-get.cc:2049
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Odporúčané balíky:"
 
-#: cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Balík %s sa nedá nájsť"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s je označený ako automaticky nainštalovaný.\n"
 
-#: cmdline/apt-get.cc:2106 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -1176,41 +1169,41 @@ msgstr ""
 "Tento príkaz je zavrhovaný. Prosím, použite namiesto neho „apt-mark auto“ a "
 "„apt-mark manual“."
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Prepočítava sa aktualizácia... "
 
-#: cmdline/apt-get.cc:2125 methods/ftp.cc:708 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Chyba"
 
-#: cmdline/apt-get.cc:2130
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Hotovo"
 
-#: cmdline/apt-get.cc:2197 cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vnútorná chyba, „problem resolver“ niečo pokazil"
 
-#: cmdline/apt-get.cc:2233 cmdline/apt-get.cc:2269
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Adresár pre sťahovanie sa nedá zamknúť"
 
-#: cmdline/apt-get.cc:2320
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr "Sťahuje sa %s %s"
 
-#: cmdline/apt-get.cc:2376
+#: cmdline/apt-get.cc:2396
 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:2416 cmdline/apt-get.cc:2728
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, 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:2433
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1220,7 +1213,7 @@ msgstr ""
 "adrese:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2438
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1232,70 +1225,70 @@ msgstr ""
 "ak chcete získať najnovšie (a pravdepodobne zatiaľ nevydané) aktualizácie "
 "balíka.\n"
 
-#: cmdline/apt-get.cc:2491
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Preskakuje sa už stiahnutý súbor „%s“\n"
 
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2548
 #, 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:2537
+#: cmdline/apt-get.cc:2557
 #, 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:2542
+#: cmdline/apt-get.cc:2562
 #, 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:2548
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Stiahnuť zdroj %s\n"
 
-#: cmdline/apt-get.cc:2586
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Zlyhalo stiahnutie niektorých archívov."
 
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2637
 #, 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:2629
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n"
 
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2650
 #, 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:2652
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Príkaz na zostavenie „%s“ zlyhal.\n"
 
-#: cmdline/apt-get.cc:2672
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Proces potomka zlyhal"
 
-#: cmdline/apt-get.cc:2691
+#: cmdline/apt-get.cc:2711
 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:2716
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
@@ -1304,17 +1297,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:2733
+#: cmdline/apt-get.cc:2753
 #, 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:2753
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nemá žiadne závislosti na zostavenie.\n"
 
-#: cmdline/apt-get.cc:2883
+#: cmdline/apt-get.cc:2903
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1323,20 +1316,20 @@ msgstr ""
 "%s závislosť pre %s nemožno splniť, pretože %s nie je povolené na balíkoch "
 "„%s“"
 
-#: cmdline/apt-get.cc:2904
+#: cmdline/apt-get.cc:2924
 #, 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:2927
+#: cmdline/apt-get.cc:2947
 #, 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:2966
+#: cmdline/apt-get.cc:2986
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1345,7 +1338,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:2972
+#: cmdline/apt-get.cc:2992
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1353,30 +1346,30 @@ msgid ""
 msgstr ""
 "%s závislosť pre %s nemožno splniť, pretože balík %s nemá kandidátsku verziu"
 
-#: cmdline/apt-get.cc:2995
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
 
-#: cmdline/apt-get.cc:3011
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Závislosti na zostavenie %s nemožno splniť."
 
-#: cmdline/apt-get.cc:3016
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Spracovanie závislostí na zostavenie zlyhalo"
 
-#: cmdline/apt-get.cc:3109 cmdline/apt-get.cc:3121
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Záznam zmien %s (%s)"
 
-#: cmdline/apt-get.cc:3240
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
-#: cmdline/apt-get.cc:3281
+#: cmdline/apt-get.cc:3301
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1464,7 +1457,7 @@ msgstr ""
 "a apt.conf(5).\n"
 "                       Tento APT má schopnosti posvätnej kravy.\n"
 
-#: cmdline/apt-get.cc:3444
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1476,33 +1469,33 @@ msgstr ""
 "      Tiež pamätajte, že zamykanie je deaktivované, takže\n"
 "      sa nespoliehajte na to že to bude platiť v reálnej situácii!"
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Už existuje "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Získava sa:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ign "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Chyba "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%sB sa stiahlo za %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Prebieha spracovanie]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1513,46 +1506,62 @@ msgstr ""
 " „%s“\n"
 "do mechaniky „%s“ a stlačte Enter\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s nemožno označiť, pretože nie je nainštalovaný.\n"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s už bol označený ako manuálne nainštalovaný.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s už bol označený ako automaticky nainštalovaný.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s bol už nastavený na podržanie.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s bol už nastavený na nepodržanie.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s je označený na podržanie.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Zrušené podržanie %s.\n"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr "Vykonanie dpkg zlyhalo. Ste root?"
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1593,11 +1602,11 @@ msgstr ""
 "  -o=? Nastaviť ľubovoľný konfiguračnú voľbu, napr. -o dir::cache=/tmp\n"
 "Ďalšie informácie nájdete na manuálových stránkach apt-mark(8) a apt.conf(5)."
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Neznámy záznam o balíku!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1657,196 +1666,198 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Zlučujú sa dostupné informácie"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Vytvorenie rúry zlyhalo"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Spustenie gzip zlyhalo "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Porušený archív"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Kontrolný súčet pre tar zlyhal, archív je poškodený"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Neznáma TAR hlavička typu %u, člen %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Neplatný podpis archívu"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Chyba pri čítaní záhlavia prvku archívu"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "Neplatná hlavička prvku archívu %s"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Neplatné záhlavie prvku archívu"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Archív je príliš krátky"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Chyba pri čítaní hlavičiek archívu"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "Pokus o uvoľnenie uzla (DropNode) na stále prepojenom uzle"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Hašovací prvok sa nedá nájsť!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Nedá sa alokovať diverzia"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Vnútorná chyba pri AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Pokus o prepísanie diverzie, %s -> %s a %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Dvojité pridanie diverzie %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Duplicitný konfiguračný súbor %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Zápis súboru %s zlyhal"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Zatvorenie súboru %s zlyhalo"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Cesta %s je príliš dlhá"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s sa rozbaľuje viackrát"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Adresár %s je divertovaný"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Diverzná cesta je príliš dlhá"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "Nedá sa nájsť uzol na adrese jeho hašu"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Cesta je príliš dlhá"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, 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:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Súbor %s/%s prepisuje ten z balíka %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:454 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:353
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Nedá sa načítať %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Nedá sa vyhodnotiť %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Odstránenie %s zlyhalo"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Nedá sa vytvoriť %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Vyhodnotenie %sinfo zlyhalo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Adresáre info a temp musia byť na tom istom súborovom systéme"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1063
-#: apt-pkg/pkgcachegen.cc:1167 apt-pkg/pkgcachegen.cc:1173
-#: apt-pkg/pkgcachegen.cc:1335
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Načítavajú sa zoznamy balíkov"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Nedá sa zmeniť na admin adresár %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Vnútorná chyba pri získavaní názvu balíka"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Načítava sa zoznam súborov"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1857,113 +1868,114 @@ msgstr ""
 "súbor, vytvorte nový prázdny a ihneď znovu nainštalujte tú istú verziu "
 "balíka!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Chyba pri čítaní súboru so zoznamami %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Vnútorná chyba pri získavaní uzla"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Zlyhalo otvorenie súboru s diverziami %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "Diverzný súbor je porušený"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Neplatný riadok v diverznom súbore: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Vnútorná chyba pri pridávaní diverzie"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "Vyrovnávacia pamäť balíkov sa musí najprv inicializovať"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Chyba pri hľadaní Balíka: hlavička, pozícia %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Zlá sekcia ConfFile v stavovom súbore na pozícii %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Chyba pri spracovaní MD5. Pozícia %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Toto nie je platný DEB archív, chýba časť „%s“"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 "Toto nie je platný DEB archív, chýba časť „%s“, „%s“ alebo „%s“"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Nedá sa prejsť do %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Vnútorná chyba, nedá sa nájsť časť %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Nedá sa nájsť platný riadiaci súbor"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Nespracovateľný riadiaci súbor"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr "Prázdne súbory nemôžu byť platné archívy"
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Nedá sa otvoriť rúra pre %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Chyba pri čítaní z procesu %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:527
-#: methods/rred.cc:536
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Vyhodnotenie zlyhalo"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:533
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Zlyhalo nastavenie času zmeny"
 
-#: methods/cdrom.cc:200
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Nedá sa čítať databáza na CD-ROM %s"
 
-#: methods/cdrom.cc:209
+#: 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"
@@ -1971,56 +1983,56 @@ msgstr ""
 "Pre pridanie CD do APT použije apt-cdrom. apt-get update sa nedá využiť na "
 "pridávanie nových CD."
 
-#: methods/cdrom.cc:219
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "Chybné CD"
 
-#: methods/cdrom.cc:246
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Nedá sa odpojiť CD-ROM v %s - možno sa ešte používa."
 
-#: methods/cdrom.cc:251
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Disk sa nenašiel."
 
-#: methods/cdrom.cc:259 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Súbor sa nenašiel"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Neplatné URI, lokálne URI nesmie začínať s //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:169
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Prihlasovanie"
 
-#: methods/ftp.cc:175
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Nedá sa zistiť názov druhej strany"
 
-#: methods/ftp.cc:180
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Nedá sa zistiť lokálny názov"
 
-#: methods/ftp.cc:211 methods/ftp.cc:239
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Server zamietol naše spojenie s chybou: %s"
 
-#: methods/ftp.cc:217
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Zlyhalo zadanie používateľa, server odpovedal: %s"
 
-#: methods/ftp.cc:224
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Zlyhalo zadanie hesla, server odpovedal: %s"
 
-#: methods/ftp.cc:244
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2028,196 +2040,196 @@ msgstr ""
 "Bol zadaný proxy server, ale nie prihlasovací skript. Acquire::ftp::"
 "ProxyLogin je prázdny."
 
-#: methods/ftp.cc:272
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Príkaz „%s“ prihlasovacieho skriptu zlyhal, server odpovedal: %s"
 
-#: methods/ftp.cc:298
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Zlyhalo zadanie typu, server odpovedal: %s"
 
-#: methods/ftp.cc:336 methods/ftp.cc:447 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Uplynul čas spojenia"
 
-#: methods/ftp.cc:342
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Server ukončil spojenie"
 
-#: methods/ftp.cc:345 apt-pkg/contrib/fileutl.cc:831 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Chyba pri čítaní"
 
-#: methods/ftp.cc:352 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Odpoveď preplnila zásobník."
 
-#: methods/ftp.cc:369 methods/ftp.cc:381
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Narušenie protokolu"
 
-#: methods/ftp.cc:453 apt-pkg/contrib/fileutl.cc:873 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Chyba pri zápise"
 
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Nedá sa vytvoriť socket"
 
-#: methods/ftp.cc:704
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "Nedá sa pripojiť dátový socket, uplynul čas spojenia"
 
-#: methods/ftp.cc:710
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Nedá sa pripojiť pasívny socket."
 
-#: methods/ftp.cc:728
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo nezískal počúvajúci socket"
 
-#: methods/ftp.cc:742
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Nedá sa nadviazať socket"
 
-#: methods/ftp.cc:746
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Na sockete sa nedá počúvať"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Názov socketu sa nedá zistiť"
 
-#: methods/ftp.cc:785
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Príkaz PORT sa nedá odoslať"
 
-#: methods/ftp.cc:795
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Neznáma rodina adries %u (AF_*)"
 
-#: methods/ftp.cc:804
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Zlyhalo zadanie EPRT, server odpovedal: %s"
 
-#: methods/ftp.cc:824
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Uplynulo spojenie dátového socketu"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Spojenie sa nedá prijať"
 
-#: methods/ftp.cc:870 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Problém s hašovaním súboru"
 
-#: methods/ftp.cc:883
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Súbor sa nedá stiahnuť, server odpovedal „%s“"
 
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Uplynula doba dátového socketu"
 
-#: methods/ftp.cc:928
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Prenos dát zlyhal, server odpovedal „%s“"
 
 #. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Dotaz"
 
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Nedá sa vyvolať "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Pripája sa k %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Nedá sa nadviazať spojenie na %s:%s (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Pripája sa k %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nie je možné preložiť „%s“"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Dočasné zlyhanie pri preklade „%s“"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, 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:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Nedá sa pripojiť k %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Bola zistená aspoň jedna nesprávna signatúra."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Neznáma chyba pri spustení gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Nasledovné signatúry sú neplatné:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2225,106 +2237,111 @@ msgstr ""
 "Nasledovné signatúry sa nedajú overiť, pretože nie je dostupný verejný "
 "kľúč:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Čaká sa na hlavičky"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Získal sa jeden riadok hlavičky cez %u znakov"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Chybná hlavička"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP server poslal neplatnú hlavičku odpovede"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP server poslal neplatnú hlavičku Content-Length"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP server poslal neplatnú hlavičku Content-Range"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Tento HTTP server má poškodenú podporu rozsahov"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Neznámy formát dátumu"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Výber zlyhal"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Uplynul čas spojenia"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupného súboru"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Chyba zápisu do súboru"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Chyba zápisu do tohto súboru"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Chyba pri čítaní zo servera"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Nepodarilo sa skrátiť súbor"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Zlé dátové záhlavie"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Vnútorná chyba"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Nedá sa vykonať mmap prázdneho súboru"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Nedá sa duplikovať popisovač súboru %i"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Nedá sa urobiť mmap %lu bajtov"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "Nedá sa zatvoriť mmap"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "Nedá sa synchronizovať mmap"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Nedá sa urobiť mmap %lu bajtov"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Nepodarilo sa skrátiť súbor"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2333,7 +2350,7 @@ msgstr ""
 "Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-"
 "Limit. Aktuálna hodnota: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2341,7 +2358,7 @@ msgid ""
 msgstr ""
 "Napodarilo sa zväčšiť veľkosť MMap, pretože limit %lu už bol dosiahnutý."
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2372,436 +2389,449 @@ msgstr "%li min %li s"
 msgid "%lis"
 msgstr "%li s"
 
-#: apt-pkg/contrib/strutl.cc:1137
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Voľba %s nenájdená"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Nerozpoznaná skratka typu: „%c“"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Otvára sa konfiguračný súbor %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaktická chyba %s:%u: Blok začína bez názvu."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntaktická chyba %s:%u: Skomolená značka"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntaktická chyba %s:%u: Za hodnotou nasledujú chybné údaje"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Syntaktická chyba %s:%u: Direktívy sa dajú vykonať len na najvyššej úrovni"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntaktická chyba %s:%u: Príliš mnoho vnorených prepojení (include)"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntaktická chyba %s:%u: Zahrnuté odtiaľ"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva „%s“"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Syntaktická chyba %s:%u: direktíva clear vyžaduje ako argument strom volieb"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntaktická chyba %s:%u: Na konci súboru sú chybné údaje"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Chyba!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Hotovo"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Parameter príkazového riadka „%c“ [z %s] je neznámy"
 
-#: apt-pkg/contrib/cmndline.cc:101 apt-pkg/contrib/cmndline.cc:109
-#: apt-pkg/contrib/cmndline.cc:117
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Nezrozumiteľný parameter %s na príkazovom riadku"
 
-#: apt-pkg/contrib/cmndline.cc:122
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Parameter príkazového riadku %s nie je pravdivostná hodnota"
 
-#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Voľba %s vyžaduje argument."
 
-#: apt-pkg/contrib/cmndline.cc:197 apt-pkg/contrib/cmndline.cc:203
+#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Parameter %s: Zadanie konfiguračnej položky musí obsahovať =<hodn>."
 
-#: apt-pkg/contrib/cmndline.cc:232
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Voľba %s vyžaduje ako argument celé číslo (integer), nie „%s“"
 
-#: apt-pkg/contrib/cmndline.cc:263
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Voľba „%s“ je príliš dlhá"
 
-#: apt-pkg/contrib/cmndline.cc:295
+#: apt-pkg/contrib/cmndline.cc:298
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr "Nezrozumiteľný význam %s, skúste true alebo false. "
 
-#: apt-pkg/contrib/cmndline.cc:345
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Neplatná operácia %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Prípojný bod %s sa nedá vyhodnotiť"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:460 apt-pkg/acquire.cc:485 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Nedá sa prejsť do %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Nedá sa vykonať stat() CD-ROM"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Súbor zámku %s sa nedá otvoriť"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Zámok %s sa nedá získať"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, 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:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, 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:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, 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:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, 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:690
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Čakalo sa na %s, ale nebolo to tam"
 
-#: apt-pkg/contrib/fileutl.cc:702
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Podproces %s obdržal chybu segmentácie."
 
-#: apt-pkg/contrib/fileutl.cc:704
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Podproces %s dostal signál %u."
 
-#: apt-pkg/contrib/fileutl.cc:708
+#: apt-pkg/contrib/fileutl.cc:737
 #, 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:710
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Podproces %s neočakávane skončil"
 
-#: apt-pkg/contrib/fileutl.cc:775 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Nedá sa otvoriť súbor %s"
 
-#: apt-pkg/contrib/fileutl.cc:792
+#: apt-pkg/contrib/fileutl.cc:923
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Nedá sa otvoriť popisovač súboru %d"
 
-#: apt-pkg/contrib/fileutl.cc:852
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Nedá sa vytvoriť podproces IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Nepodarilo sa spustiť kompresor "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "čítanie, stále treba prečítať %lu, ale už nič neostáva"
 
-#: apt-pkg/contrib/fileutl.cc:885
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "zápis, stále treba zapísať %lu, no nedá sa to"
 
-#: apt-pkg/contrib/fileutl.cc:1021
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problém pri zatváraní gzip súboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1024
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problém pri zatváraní súboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1419
 #, 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:1040
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problém pri odstraňovaní súboru %s"
 
-#: apt-pkg/contrib/fileutl.cc:1053
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Problém pri synchronizovaní súboru"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Vyrovnávacia pamäť balíkov je prázdna"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Súbor vyrovnávacej pamäti balíkov je poškodený"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "Súbor vyrovnávacej pamäti balíkov je nezlučiteľnej verzie"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Súbor vyrovnávacej pamäti balíkov je poškodený"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Tento APT nepodporuje systém na správu verzií „%s“"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 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:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Závisí na"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Predzávisí na"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Navrhuje"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Odporúča"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Koliduje s"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Nahrádza"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Zneplatňuje"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Kazí"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "Rozširuje"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "dôležitý"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "požadovaný"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "štandardný"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "voliteľný"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Vytvára sa strom závislostí"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Kandidátske verzie"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Generovanie závislostí"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Načítavajú sa stavové informácie"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Nie je možné otvoriť StateFile %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Nie je možné zapísať dočasný StateFile %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Súbor %s sa nedá spracovať (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Súbor %s sa nedá spracovať (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 "Skomolený riadok %lu v zozname zdrojov %s (nie je možné spracovať [option])"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Skomolený riadok %lu v zozname zdrojov %s ([option] je príliš krátke)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nie je priradenie)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nemá kľúč)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] kľúč %s nemá hodnotu)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Skomolený riadok %lu v zozname zdrojov %s (absolútny dist)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Otvára sa %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:645
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2810,7 +2840,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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Nedá sa otvoriť súbor „%s“"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2821,27 +2856,18 @@ msgstr ""
 "kvôli slučke v Conflicts/Pre-Depends. Často je to nevhodné, ale ak to chcete "
 "naozaj urobiť, aktivujte možnosť APT::Force-LoopBreak."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"Nebolo možné vykonať okamžitú konfiguráciu už rozbaleného „%s“. Pozri prosím "
-"podrobnosti v man 5 apt.conf pod APT::Immediate-Configure"
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Indexový súbor typu „%s“ nie je podporovaný"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 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:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2849,11 +2875,11 @@ msgstr ""
 "Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené "
 "pridržanými balíkmi."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 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:1471 apt-pkg/algorithms.cc:1473
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2861,79 +2887,79 @@ msgstr ""
 "Niektoré indexové súbory sa nepodarilo stiahnuť. Boli ignorované alebo sa "
 "použili staršie verzie."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Adresár zoznamov %spartial chýba."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Archívny adresár %spartial chýba."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "Adresár %s sa nedá zamknúť"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:861
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Sťahuje sa %li. súbor z %li (zostáva %s)"
 
-#: apt-pkg/acquire.cc:863
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Sťahuje sa %li. súbor z %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Nedá sa nájsť ovládač spôsobu %s."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Spôsob %s nebol správne spustený"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:146
+#: 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:162
+#: 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"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Nie je možné vykonať stat %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Do sources.list musíte zadať nejaký „source“ (zdrojový) URI"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Zoznamy balíkov alebo stavový súbor sa nedajú spracovať alebo otvoriť."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Na opravu týchto problémov môžete skúsiť spustiť apt-get update"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Nedá sa načítať zoznam zdrojov."
 
-#: apt-pkg/policy.cc:72
+#: apt-pkg/policy.cc:74
 #, c-format
 msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
@@ -2942,126 +2968,88 @@ msgstr ""
 "„%s“ nie je platná hodnota pre APT::Default-Release, pretože také vydanie "
 "nie je dostupné v zdrojoch"
 
-#: apt-pkg/policy.cc:390
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Neplatný záznam v súbore nastavení %s, chýba hlavička Package"
 
-#: apt-pkg/policy.cc:412
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Nezrozumiteľné pridržanie typu %s"
 
-#: apt-pkg/policy.cc:420
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Nebola zadaná žiadna (alebo nulová) priorita na pridržanie"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií"
 
-#: apt-pkg/pkgcachegen.cc:190
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Chyba pri spracovávaní %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:207
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Chyba pri spracovávaní %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:245
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Chyba pri spracovávaní %s (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:277
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Chyba pri spracovávaní %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:281
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Chyba pri spracovávaní %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:298 apt-pkg/pkgcachegen.cc:308
-#: apt-pkg/pkgcachegen.cc:316
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Vyskytla sa chyba pri spracovávaní %s (NewVersion%d)"
-
-#: apt-pkg/pkgcachegen.cc:312
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Chyba pri spracovávaní %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:345
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Vyskytla sa chyba pri spracovávaní %s (NewFileDesc2)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Chyba pri spracovávaní %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Fíha, prekročili ste počet názvov balíkov, ktoré toto APT zvládne spracovať."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Fíha, prekročili ste počet verzií, ktoré toto APT zvládne spracovať."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Fíha, prekročili ste počet popisov, ktoré toto APT zvládne spracovať."
 
-#: apt-pkg/pkgcachegen.cc:360
+#: apt-pkg/pkgcachegen.cc:243
 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:389
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Chyba pri spracovávaní %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:403
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Chyba pri spracovávaní %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:975
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
 
-#: apt-pkg/pkgcachegen.cc:1080
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Collecting File poskytuje"
 
-#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1281
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "premenovanie zlyhalo, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "Nezhoda kontrolných MD5 súčtov"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1847
-#: apt-pkg/acquire-item.cc:1990
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Nezhoda kontrolných haš súčtov"
 
-#: apt-pkg/acquire-item.cc:1387
+#: apt-pkg/acquire-item.cc:1399
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3070,16 +3058,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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1438
+#: apt-pkg/acquire-item.cc:1450
 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:1476
+#: apt-pkg/acquire-item.cc:1488
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3088,12 +3076,12 @@ 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:1498
+#: apt-pkg/acquire-item.cc:1510
 #, 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:1531
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3103,12 +3091,12 @@ msgstr ""
 "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:1541 apt-pkg/acquire-item.cc:1546
+#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Chyba GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1638
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3117,7 +3105,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:1697
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3126,47 +3114,47 @@ 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:1752
+#: apt-pkg/acquire-item.cc:1768
 #, 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:1839
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Veľkosti sa nezhodujú"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Nedá spracovať súbor Release %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Žiadne sekcie v Release súbore %s"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, 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:110
+#: apt-pkg/indexrecords.cc:118
 #, 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:129
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Chýba položka „Date“ v súbore Release %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Blok výrobcu %s neobsahuje otlačok (fingerprint)"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3175,41 +3163,41 @@ msgstr ""
 "Použije sa CD-ROM prípojný bod %s\n"
 "Pripája sa CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Identifikuje sa.."
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Uložená menovka: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "CD-ROM sa odpája...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Použije sa prípojný bod CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "CD-ROM sa odpája\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Čaká sa na disk...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Pripája sa CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Na disku sa hľadajú indexové súbory..\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3218,7 +3206,7 @@ msgstr ""
 "Nájdených %zu indexov balíkov, %zu indexov zdrojových balíkov, %zu indexov "
 "prekladov a %zu signatúr\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3226,16 +3214,16 @@ msgstr ""
 "Nepodarilo sa nájsť žiadne súbory balíkov, možno toto nie je disk s Debianom "
 "alebo je pre nesprávnu architektúru?"
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Nájdená menovka: „%s“\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Neplatný názov, skúste znova.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3244,90 +3232,90 @@ msgstr ""
 "Názov tohto disku je: \n"
 "„%s“\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Kopírujú sa zoznamy balíkov..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Zapisuje sa nový zoznam zdrojov\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "Položky zoznamu zdrojov pre tento disk sú:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:927
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Zapísaných %i záznamov.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:929
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, 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:275 apt-pkg/indexcopy.cc:932
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:935
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, 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"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Preskakuje sa neexistujúci súbor %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Nebolo možné nájsť autentifikačný záznam pre: %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Nezhoda kontrolných haš súčtov: %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Nebolo nájdené vydanie „%s“ pre „%s“"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Nebola nájdená verzia „%s“ pre „%s“"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Nebolo možné nájsť úlohu „%s“"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "Nie je možné vybrať verzie z balíka „%s“, pretože je čisto virtuálny"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3336,127 +3324,151 @@ msgstr ""
 "Nie je možné vybrať nainštalované ani kandidátske verzie z balíka „%s“, "
 "pretože nemá žiadnu z nich"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Nie je možné vybrať najnovšiu verziu z balíka „%s“, pretože je čisto "
 "virtuálny"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Nie je možné vybrať kandidátsku verziu z balíka „%s“, pretože nemá kandidáta"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Nie je možné vybrať nainštalovanú verziu z balíka „%s“, pretože nie je "
 "nainštalovaný"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "Inštaluje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Nastavuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Odstraňuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "Úplne sa odstraňuje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Zaznamenali sme zmiznutie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Adresár „%s“ chýba"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Nedá sa otvoriť súbor „%s“"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Pripravuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Rozbaľuje sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Pripravuje sa nastavenie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "Nainštalovaný balík %s"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Pripravuje sa odstránenie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "Odstránený balík %s"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Pripravuje sa úplné odstránenie %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "Balík „%s“ je úplne odstránený"
 
-#: apt-pkg/deb/dpkgpm.cc:1087
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1118
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "Spúšťa sa dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1344
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1349
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "problém so závislosťami - ponecháva sa nenakonfigurované"
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3464,7 +3476,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:1357
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3472,7 +3484,7 @@ msgstr ""
 "Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
 "zaplnený"
 
-#: apt-pkg/deb/dpkgpm.cc:1363
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3480,56 +3492,56 @@ msgstr ""
 "Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku "
 "pamäte"
 
-#: apt-pkg/deb/dpkgpm.cc:1370
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Nezapíše sa správa apport, pretože chybová správa indikuje V/V chybu dpkg"
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr "Nedá sa zamknúť adresár na správu (%s), používa ho iný proces?"
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Nedá sa zamknúť adresár na správu (%s), ste root?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s“. "
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Nie je zamknuté"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "Na zrkadle nebol nájdený súbor „%s“"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Nepodarilo sa prečítať súbor „%s“ na zrkadle"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Zrkadlo: %s]"
 
-#: methods/rred.cc:506
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3538,7 +3550,7 @@ msgstr ""
 "Nepodarilo sa záplatovať %s pomocou mmap a pomocou operácie so súborom - zdá "
 "sa, že záplata je poškodená."
 
-#: methods/rred.cc:511
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3547,10 +3559,68 @@ msgstr ""
 "Nepodarilo sa záplatovať %s pomocou mmap (ale nevyskytla sa chyba týkajúca "
 "sa mmap) - zdá sa, že záplata je poškodená."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Spojenie bolo predčasne ukončené"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Pozn.: Toto robí dpkg automaticky a zámerne."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Skomolený „override“ %s riadok %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Skomolený „override“ %s riadok %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Skomolený „override“ %s riadok %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "dekompresor"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "čítanie, stále treba prečítať %lu, ale už nič neostáva"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "zápis, stále treba zapísať %lu, no nedá sa to"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "Nebolo možné vykonať okamžitú konfiguráciu už rozbaleného „%s“. Pozri "
+#~ "prosím podrobnosti v man 5 apt.conf pod APT::Immediate-Configure"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Chyba pri spracovávaní %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Chyba pri spracovávaní %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Chyba pri spracovávaní %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Chyba pri spracovávaní %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Chyba pri spracovávaní %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Vyskytla sa chyba pri spracovávaní %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Chyba pri spracovávaní %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Vyskytla sa chyba pri spracovávaní %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Chyba pri spracovávaní %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Chyba pri spracovávaní %s (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Vnútorná chyba, nedá sa nájsť člen"
 
diff --git a/po/sl.po b/po/sl.po
index 0e2252543..2408447e9 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3,8 +3,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+0200\n"
 "PO-Revision-Date: 2011-03-06 15:47+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -20,149 +20,150 @@ msgstr ""
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paket %s različica %s ima nerešene odvisnosti:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Vseh imen paketov: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Skupno struktur paketov : "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Običajni paketi: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Čisti navidezni paketi: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Posamezni navidezni paketi: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Mešani navidezni paketi: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Manjka: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Vseh različic: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Skupno različnih opisov: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Vseh odvisnosti: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Vseh povezav Raz/Dat: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Skupno razmerij opisov/datotek: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Vseh dobljenih preslikav: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Vseh razširjenih nizov: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Celotna velikost z odvisnostmi različice: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Celotna ohlapna velikost: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Celotna velikost, izračunana za: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Datoteka paketa %s ni usklajena."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Noben paket ni bil najden"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "Podati morate vsaj en iskalni vzorec"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ni mogoče najti paketa %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Datoteke paketa:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Pripeti paketi:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(ni najdeno)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Nameščen: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(brez)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Bucika paketa: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Preglednica različic:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -235,28 +236,28 @@ msgstr ""
 "Oglejte si strani priročnika apt-cache(8) in apt.conf(5) za več "
 "podrobnosti.\n"
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Vstavite disk v pogon in pritisnite vnosno tipko"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Priklapljanje '%s' na '%s' je spodletelo"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 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."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Argumenti niso v parih"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -284,12 +285,12 @@ 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:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s ni veljaven paket DEB."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -313,40 +314,40 @@ 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:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Ni mogoče pisati na %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Ni mogoče ugotoviti različice debconfa. Je sploh nameščen?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Seznam razširitev paketov je predolg"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Napaka med obdelavo mape %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Seznam razširitev virov je predolg"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Napaka med pisanjem glave v datoteko vsebine"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Napaka med obdelavo vsebine %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -426,26 +427,26 @@ msgstr ""
 "  -c=? prebere to nastavitveno datoteko\n"
 "  -o=? nastavi poljubno možnost nastavitve"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Nobena izbira se ne ujema"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Nekatere datoteke manjkajo v skupini datotek paketov `%s'"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "Podatkovna zbirka je pokvarjena, datoteka je preimenovana v %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "PZ je star, poskušanje nadgradnje %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -453,111 +454,111 @@ msgstr ""
 "Oblika podatkovne zbirke je neveljavna. V kolikor ste nadgradili s starejše "
 "različice apt, podatkovno zbirko odstranite in jo znova ustvarite."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Ni mogoče odprti datoteke PZ %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Napaka med določitvijo %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Arhiv nima nadzornega zapisa"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Ni mogoče najti kazalke"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "O: ni mogoče brati mape %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "O: Ni mogoče določiti %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "O: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "N: Napake se sklicujejo na datoteko "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Ni mogoče razrešiti %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Hoja drevesa je spodletela"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Ni mogoče odprti %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " RazVeži %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Napaka med branjem povezave %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Napaka med odvezovanjem %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Napaka med povezovanjem %s in %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Dosežena meja RazVezovanja %sB.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Arhiv ni imel polja s paketom"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s nima prepisanega vnosa\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  Vzdrževalec %s je %s in ne %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s nima izvornega vnosa prepisa\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s nima tudi binarnega vnosa prepisa\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Napaka med dodeljevanjem pomnilnika"
 
@@ -567,18 +568,18 @@ msgid "Unable to open %s"
 msgstr "Ni mogoče odpreti %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Napačno oblikovana prepisana vrstica %s %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Napačno oblikovana prepisana vrstica %s %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Napačno oblikovanje prepisane vrstice %s %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -586,63 +587,51 @@ msgstr "Napačno oblikovanje prepisane vrstice %s %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "Napaka med branjem prepisane datoteke %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Neznan algoritem stiskanja '%s'"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Stisnjen izhod %s potrebuje niz stiskanja"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Ustvarjanje cevi IPC do podopravila je spodletelo"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Ustvarjanje DATOTEKE* ni uspelo"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Vejitev ni uspela"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Podrejeni predmet stiskanja"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Notranja napaka. Ni mogoče ustvariti %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Ni mogoče ustvariti podopravila IPD"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Ni mogoče izvesti stiskanja "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "program za razširjanje"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "VI podopravila/datoteke je spodletel"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Med računanjem MD5 ni mogoče brati"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Napaka med odvezovanjem %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Ni mogoče preimenovati %s v %s"
@@ -651,75 +640,79 @@ msgstr "Ni mogoče preimenovati %s v %s"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Napaka med prevajanjem logičnega izraza - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Naslednji paketi imajo nerešene odvisnosti:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "vendar je paket %s nameščen"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "vendar bo paket %s nameščen"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "vendar se ga ne da namestiti"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "vendar je navidezen paket"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "vendar ni nameščen"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "vendar ne bo nameščen"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " ali"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Naslednji NOVI paketi bodo nameščeni:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Naslednji paketi so bili zadržani:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Naslednji paketi bodo nadgrajeni:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Naslednji paketi bodo POSTARANI:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Naslednji zadržani paketi bodo spremenjeni:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (zaradi %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -727,59 +720,59 @@ msgstr ""
 "OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n"
 "Tega NE storite, razen če ne veste natanko kaj počenjate!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu nadgrajenih, %lu na novo nameščenih, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu posodobljenih, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu postaranih, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Izbiranje '%s' za nalogo '%s'\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Izbiranje '%s' za logični izraz '%s'\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Paket %s je navidezen in ga je priskrbel:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Nameščeno]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr " [Ni različica kandidata]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Sami izberite paket, ki ga želite namestiti."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -790,126 +783,126 @@ msgstr ""
 "To ponavadi pomeni, da paket manjka, je zastaran ali\n"
 "pa je na voljo samo iz drugega vira.\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Kakorkoli, naslednji paketi ga nadomestijo:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Paket '%s' nima namestitvenega kandidata"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "Navideznih paketov kot je '%s' ni mogoče odstraniti\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Izbiranje '%s' namesto '%s'\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "%s je preskočen, ker je že nameščen in ne potrebuje nadgradnje.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "Preskok %s, ni nameščen in zahtevane so le nadgradnje\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Ponovna namestitev %s ni možna, ker prejem ni možen.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "Najnovejša različica %s je že nameščena.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s je bil nastavljen na ročno nameščen.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Izbrana različica '%s' (%s) za '%s'\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Izbrana različica '%s' (%s) za '%s' namesto '%s'\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Paket %s ni nameščen, zato ni odstranjen\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Popravljanje odvisnosti ..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " spodletelo."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Ni mogoče popraviti odvisnosti"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Ni mogoče pomanjšati zbirke za nadgradnjo"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Opravljeno"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Če želite popraviti napake, poskusite pognati 'apt-get -f install'."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nerešene odvisnosti. Poskusite uporabiti -f."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "POZOR: Naslednjih paketov ni bilo mogoče overiti!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Opozorilo overitve je bilo prepisano.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Ali želite te pakete namestiti brez preverjanja [y/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Nekaterih paketkov bi bilo mogoče overiti"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Prišlo je do težav in -y je bil uporabljen brez --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Notranja napaka, NamestiPakete je bil klican z pokvarjenimi paketi!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Odstraniti je treba pakete, a je odstranjevanje onemogočeno."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Notranja napaka, Urejanje se ni končalo"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Kako čudno .. Velikosti se ne ujemata, pošljite sporočilo na apt@packages."
@@ -917,52 +910,52 @@ 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Potrebno je dobiti %sB/%sB 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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Potrebno je dobiti %sB 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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Po tem opravilu bo porabljenega %sB dodatnega prostora.\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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 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:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Ni mogoče določiti prostega prostora v %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Na %s je premalo prostora."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Navedena je možnost Samo preprosto, a to opravilo ni preprosto."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Da, naredi tako kot pravim!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -973,28 +966,28 @@ msgstr ""
 "Za nadaljevanje vtipkajte frazo '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Prekini."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Ali želite nadaljevati [Y/n]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ni mogoče dobiti %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Prejem nekaterih datotek ni uspel"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Prejem je dokončan in uporabljen je način samo prejema"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1002,19 +995,19 @@ msgstr ""
 "Nekaterih arhivov ni mogoče dobiti. Poskusite uporabiti apt-get update ali --"
 "fix-missing."
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing in izmenjava medija trenutno nista podprta"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Ni mogoče popraviti manjkajočih paketov."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Prekinjanje namestitve."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1034,37 +1027,37 @@ msgstr[3] ""
 "Naslednji paketi so izginili z vašega sistema, ker so vse\n"
 "datoteke prepisali drugi paketi:"
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Opomba: To je dpkg storil samodejno in namenoma."
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Prezri nerazpoložljiv cilj izdaje '%s' paketa '%s'"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Izbiranje '%s' kot vir paketa namesto '%s'\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Prezri nerazpoložljivo različico '%s' paketa '%s'"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Ukaz update ne sprejema argumentov"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Program ne bi smel brisati stvari, ni mogoče zagnati "
 "SamodejnegaOdstranjevalnika"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1083,15 +1076,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "Naslednji podatki vam bodo morda pomagali rešiti težavo:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Notranja napaka, SamodejniOdstranjevalnik je pokvaril stvari"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1103,7 +1096,7 @@ msgstr[2] ""
 "Naslednja paketa sta bila samodejno nameščena in nista več zahtevana:"
 msgstr[3] "Naslednji paketi so bili samodejno nameščeni in niso več zahtevani:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1113,19 +1106,19 @@ msgstr[1] "%lu paket je bil samodejno nameščen in ni bil več zahtevan.\n"
 msgstr[2] "%lu paketa sta bila samodejno nameščena in nista več zahtevana.\n"
 msgstr[3] "%lu paketi so bili samodejno nameščeni in niso več zahtevani.\n"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Uporabite 'apt-get autoremove' za njihovo odstranitev."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Notranja napaka zaradi AllUpgrade."
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Poskusite zagnati 'apt-get -f install', če želite popraviti naslednje:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1133,7 +1126,7 @@ msgstr ""
 "Nerešene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
 "navedite rešitev)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1145,74 +1138,74 @@ msgstr ""
 ", da nekateri zahtevani paketi še niso ustvarjeni ali premaknjeni\n"
 " iz Prihajajočega."
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Pokvarjeni paketi"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Naslednji dodatni paketi bodo nameščeni:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Predlagani paketi:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Priporočeni paketi:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Ni mogoče najti paketa %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s je nastavljen na samodejno nameščen.\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Preračunavanje nadgradnje ... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Spodletelo"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Opravljeno"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Notranja napaka, reševalnik težav je pokvaril stvari"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Ni mogoče zakleniti mape prejemov"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr "Prejemanje %s %s"
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 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:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Izvornega paketa za %s ni mogoče najti"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1221,7 +1214,7 @@ msgstr ""
 "OPOMBA: pakiranje '%s' vzdrževano v sistemu nadzora različice '%s' na:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1232,107 +1225,107 @@ msgstr ""
 "bzr get %s\n"
 "za pridobivanje zadnjih (morda neizdanih) posodobitev paketa.\n"
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Preskok že prejete datoteke '%s'\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Dobi vir %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Nekaterih arhivov ni mogoče pridobiti."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, 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:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Ukaz gradnje '%s' ni uspel.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Podrejeno opravilo ni uspelo"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 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:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, 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:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nima odvisnosti za gradnjo.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "%s odvisnosti za %s ni mogoče zadostiti, ker ni mogoče najti paketa %s"
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, 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:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1341,37 +1334,37 @@ msgstr ""
 "%s odvisnosti za %s ni mogoče zadostiti, ker nobena različica paketa %s ne "
 "more zadostiti zahtevi po različici"
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "%s odvisnosti za %s ni mogoče zadostiti, ker ni mogoče najti paketa %s"
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, 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:2996
+#: cmdline/apt-get.cc:3031
 #, 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:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Obdelava odvisnosti za gradnjo je spodletela"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Dnevnik sprememb za %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Podprti moduli:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1461,7 +1454,7 @@ msgstr ""
 "sources.list(5) in apt.conf(5).\n"
 "                       Ta APT ima zmožnosti Super krave.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1473,33 +1466,33 @@ msgstr ""
 "     Zaklepanje je onemogočeno, zato se ne zanašajte\n"
 "     na pomembnost trenutnega pravega stanja!"
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Zadetek "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Dobi:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Prezr "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Nap "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Pridobljenih %sB v %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Delo]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1510,46 +1503,62 @@ msgstr ""
 " '%s'\n"
 "v enoto '%s' in pritisnite vnosno tipko\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "vendar ni nameščen"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s je bil nastavljen na ročno nameščen.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s je nastavljen na samodejno nameščen.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "Najnovejša različica %s je že nameščena.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "Najnovejša različica %s je že nameščena.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s je bil nastavljen na ročno nameščen.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Ni mogoče odprti %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1571,11 +1580,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Neznan zapis paketa!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1637,196 +1646,198 @@ msgstr "nad tem sporočilom. Popravite jih in poženite Namest[I]tev še enkrat"
 msgid "Merging available information"
 msgstr "Združevanje razpoložljivih podaktov"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Ni mogoče ustvariti pip"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Ni mogoče izvesti gzip "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Pokvarjen arhiv"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Nadzorna vsota tar ni uspela, arhiv je pokvarjen"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Neznana vrsta glave TAR %u, član %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Neveljaven podpis arhiva"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Napaka med branjem glave člana arhiva"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "Neveljavna glava arhiva člana %s"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Neveljavna glava člana arhiva"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Arhiv je prekratek"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Glav arhiva ni mogoče brati"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "DropNode je poklical stabilno povezano vozlišče"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Ni mogoče najti razpršenega elementa!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Ni mogoče dodeliti odklona"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Notranja napaka v AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Poskus prepisovanja odklona, %s -> %s in %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Dvojni seštevek odklona %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Dvojnik datoteke z nastavitvami %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Zapisovanje datoteke %s je spodletelo"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Napaka med zapiranjem datoteke %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Pot %s je predolga"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Odpakiranje %s več kot enkrat"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Mapa %s je odklonjena"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Pot odklona je predloga"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "Iskanje vozlišča v njegovem razpršenem vedru ni uspelo"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Pot je predolga"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, 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:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ni mogoče brati %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Ni mogoče določiti %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Odstranitev %s ni uspela"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Ni mogoče ustvariti %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Določitev %sinfo ni uspela"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Podatki in začasne mape morajo biti na istem datotečnem sistemu"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Branje seznama paketov"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Sprememba v skrbnikovo mapo %sinfo ni uspela"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Notranja napaka med dobivanjem imena paketa"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Branje seznama datotek"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1836,113 +1847,114 @@ msgstr ""
 "Odpiranje datoteke s seznamom '%sinfo/%s' ni uspelo. Če ne morete obnoviti "
 "datoteke, jo izpraznite in takoj znova namestite enako različico paketa!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Branje datoteke s seznamom %sinfo/%s ni uspelo"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Notranja napaka med dobivanjem vozlišča"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Odpiranje datoteke z odklonom %sdiversions ni uspelo"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "Datoteka z odklonom je pokvarjena"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Neveljavna vrstica v datoteki z odklonom: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Notranja napaka med dodajanjem odklona"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "Najprej se mora začeti predpomnilnik paketov"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Napaka med iskanjem paketa: glava, odmik %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Napačna izbira ConfFile v datoteki stanja. Odmik %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Napaka med razčlenjevanjem MD5. Odmik %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "To ni veljaven arhiv DEB. Manjka član '%s'."
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 "To ni veljaven arhiv DEB, nima člana '%s', '%s' ali '%s'"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Ni mogoče spremeniti v %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Notranja napaka. Ni mogoče najti člana %s."
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Ni mogoče najti veljavne nadzorne datoteke"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Nadzorne datoteke ni mogoče razčleniti"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr "Prazne datoteke ne morejo biti veljavni arhivi"
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Ni mogoče odprti cevi za %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Napaka med branjem iz opravila %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Določitev ni uspela"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Nastavitev časa spremembe je spodletela"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Ni mogoče brati podatkovne zbirke %s na CD-ROM-u"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1950,56 +1962,56 @@ msgstr ""
 "Uporabite apt-cdrom, če želite, da APT prepozna CD. apt-get update ne more "
 "sam dodati novih CD-ROM-ov"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "Napačen CD-ROM"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Ni mogoče odklopiti CD-ROM-a v %s, ker je morda še v uporabi."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Diska ni mogoče najti."
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Datoteke ni mogoče najti"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Neveljaven URI. Krajevni URI-ji se morajo začeti z //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Prijavljanje"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Ni mogoče ugotoviti imena gostitelja"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Ni mogoče določiti krajevnega imena"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Strežnik je zavrnil povezavo in sporočil: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER je spodletel, strežnik je odgovoril: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS je spodletel, strežnik je odgovoril: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2007,303 +2019,308 @@ msgstr ""
 "Naveden je bil posredniški strežnik, ne pa tudi prijavni skript. Acquire::"
 "ftp::ProxyLogin je prazen."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Ukaz prijavne skripte '%s' ni uspel, strežnik je odgovoril: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE je spodletel, strežnik je odgovoril: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Povezava je zakasnela"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Strežnik je zaprl povezavo"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Napaka branja"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Odgovor je prekoračil predpomnilnik."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Okvara protokola"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Napaka pisanja"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Ni mogoče ustvariti vtiča"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "Ni mogoče povezati podatkovnega vtiča. Povezava je zakasnela."
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Ni mogoče povezat pasivnega vtiča."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo ni mogel dobiti poslušajočega vtiča"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Ni mogoče povezati vtiča"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Ni mogoče poslušati na vtiču"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Ni mogoče določiti imena vtiča"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Ni mogoče poslati ukaza PORT"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Neznan naslov družine %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT ni uspel, strežnik je odgovoril: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Povezava podatkovne vtičnice je zakasnela"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Ni mogoče sprejeti povezave"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Težava med razprševanjem datoteke"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Ni mogoče pridobiti datoteke, strežnik je odgovoril '%s'"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Podatkovna vtič je potekel"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Prenos podatkov ni uspel, strežnik je odgovoril '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Poizvedba"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Ni mogoče klicati "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Povezovanje z %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, 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:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Povezovanje z %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Ni mogoče razrešiti '%s'"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Začasna napaka med razreševanjem '%s'"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, 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:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Ni se mogoče povezati z %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Najden je bil vsaj en neveljaven podpis."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Neznana napaka med izvajanjem gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Naslednji podpisi so bili neveljavni:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 "Naslednjih podpisov ni mogoče preveriti, ker javni ključ ni na voljo:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Čakanje na glave"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Dobljena je ena vrstica glave preko %u znakov"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Neveljavna vrstica glave"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Strežnik HTTP je poslal neveljavno glavo odgovora"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Strežnik HTTP je poslal glavo z neveljavno dolžino vsebine"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Strežnik HTTP je poslal glavo z neveljavnim obsegom vsebine"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Ta strežnik HTTP ima pokvarjen obseg podpore"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Neznana oblika datuma"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Izbira ni uspela"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Povezava je zakasnela"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Napaka med pisanjem v izhodno datoteko"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Napaka med pisanjem v datoteko"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Napaka med pisanjem v datoteko"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Napaka med branjem s strežnika. Oddaljeni del je zaprl povezavo"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Napaka med branjem s strežnika"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Ni mogoče obrezati datoteke"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Napačni podatki glave"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Notranja napaka"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "mmap prazne datoteke ni mogoč"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Ni mogoče podvojiti opisnika datotek %i"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Ni mogoče narediti mmap %lu bajtov"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "Ni mogoče zapreti mmap"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "Ni mogoče uskladiti mmap"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Ni mogoče narediti mmap %lu bajtov"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Ni mogoče obrezati datoteke"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2312,7 +2329,7 @@ msgstr ""
 "Dinamičnemu MMap je zmanjkalo prostora. Povečajte velikost APT::Omejitev-"
 "Predpomnilnika. Trenutna vrednost: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2320,7 +2337,7 @@ msgid ""
 msgstr ""
 "Ni mogoče povečati velikosti MMap, ker je omejitev %lu bajtov že dosežena."
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2350,95 +2367,95 @@ msgstr "%limin %lis"
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Izbire %s ni mogoče najti"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Neprepoznana vrsta okrajšave: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Odpiranje nastavitvene datoteke %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Skladenjska napaka %s:%u: Blok se začne brez imena."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Skladenjska napaka %s:%u: Slabo oblikovana oznaka."
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Skladenjska napaka %s:%u: Dodatna krama za vrednostjo."
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Skladenjska napaka %s:%u: Napotki se lahko izvedejo le na vrhnji ravni."
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Skladenjska napaka %s:%u: Preveč vgnezdenih vključitev"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Skladenjska napaka %s:%u: Vključeno od tu"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Skladenjska napaka %s:%u: počisti ukaz zahteva drevo možnosti kot argument"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Skladenjska napaka %s:%u: Dodatna krama na koncu datoteke"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s ... Napaka!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s ... Narejeno"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Možnost ukazne vrstice '%c' [iz %s] ni poznana."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Možnosti ukazne vrstice %s ni mogoče razumeti"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Možnost ukazne vrstice %s ni boolova vrednost"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Možnost %s zahteva argument."
@@ -2448,343 +2465,356 @@ msgstr "Možnost %s zahteva argument."
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Možnost %s: Določilo predmeta nastavitve zahtevajo =<val>."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Možnost %s zahteva celoštevilski argument, ne '%s'"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Možnost '%s' je predolga"
 
-#: 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 "Pomena %s ni mogoče razumeti, poskusite pravilno ali napačno."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Neveljavno opravilo %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Ni mogoče določiti priklopne točke %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Ni mogoče spremeniti v %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Ni mogoče določiti CD-ROM-a"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Ni mogoče odprti zaklenjene datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Ni mogoče zakleniti datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, 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:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, 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:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, 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:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, 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:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Program je čakal na %s a ga ni bilo tam"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Pod-opravilo %s je prejelo segmentacijsko napako."
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Pod-opravilo %s je prejelo signal %u."
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, 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:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Pod-opravilo %s se je nepričakovano zaključilo"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Ni mogoče odpreti datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Ni mogoče odpreti opisnika datotek %d"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Ni mogoče ustvariti podopravila IPD"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Ni mogoče izvesti stiskanja "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "branje, še vedno %lu za branje, a nobeden ni ostal"
 
-#: apt-pkg/contrib/fileutl.cc:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "pisanje, še vedno %lu za pisanje, a ni mogoče"
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Težava med zapiranjem gzip datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Težava med zapiranjem datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Težava med preimenovanje datoteke %s v %s"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Težava med razvezovanjem datoteke %s"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Težava med usklajevanjem datoteke"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Prazen predpomnilnik paketov"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Datoteka s predpomnilnikom paketov je pokvarjena"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "Različica datoteke s predpomnilnikom paketov ni združljiva"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Datoteka s predpomnilnikom paketov je pokvarjena"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Ta APT ne podpira sistema različic '%s'"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "Predpomnilnik paketov je bil izgrajen za drugačno arhitekturo"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Odvisen od"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Predodvisen od"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Priporoča"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Priporoča"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "V sporu z"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Zamenja"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Zastara"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Pokvari"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "Izboljša"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "pomembno"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "obvezno"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "običajni"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "izbirno"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "dodatno"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Gradnja drevesa odvisnosti"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Različice kandidatov"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Ustvarjanje odvisnosti"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Branje podatkov o stanju"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Odpiranje DatotekeStanja %s je spodletelo"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Pisanje začasne DatotekeStanja %s je spodletelo"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Ni mogoče razčleniti datoteke paketa %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Ni mogoče razčleniti datoteke paketa %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 "Slabo oblikovana vrstica %lu na seznamu virov %s ([možnosti] ni mogoče "
 "razčleniti)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([možnost] prekratka)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Slabo oblikovana vrstica %lu na seznamu vrstic %s ([%s] ni dodelitev)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] nima ključa)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 "Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] ključ %s nima "
 "vrednosti)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (distribucija)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 "Slabo oblikovana vrstica %lu v seznamu virov %s (absolutna distribucija)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev distribucije)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Odpiranje %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Vrstica %u v seznamu virov %s je predolga."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, 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:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2793,7 +2823,12 @@ msgstr ""
 "Ni mogoče izvesti takojąnje nastavitve na '%s'. Oglejte si man5 apt.conf pod "
 "APT::Takojąnja-nastavitev za podrobnosti. (%d)"
 
-#: apt-pkg/packagemanager.cc:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Ni mogoče odpreti datoteke '%s'"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2804,27 +2839,18 @@ msgstr ""
 "zanke spora/predodvisnosti. To je ponavadi slabo, toda če zares želite "
 "nadaljevati, vključite možnost APT::Force-LoopBreak."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"Ni mogoče izvesti takojąnje nastavitve že razpakiranega '%s'. Oglejte si man "
-"5 apt.conf pod APT::Takojšnja-Nastavitev za podrobnosti"
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 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:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2832,11 +2858,11 @@ msgstr ""
 "Napaka. pkgProblemResolver::Napake pri razrešitvi, ki so jih morda "
 "povzročili zadržani paketi."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Ni mogoče popraviti težav. Imate pokvarjene pakete."
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2844,203 +2870,165 @@ msgstr ""
 "Prejem nekaterih datotek kazala je spodletel. Bile so prezrte ali pa so bile "
 "namesto njih uporabljene stare."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Mapa seznama %spartial manjka."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Mapa arhivov %spartial manjka."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "Mape %s ni mogoče zakleniti"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Pridobivanje datoteke %li od %li (%s preostalo)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Pridobivanje datoteke %li od %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Gonilnika načinov %s ni mogoče najti."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Način %s se ni začel pravilno"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Paketni sistem '%s' ni podprt"
 
-#: apt-pkg/init.cc:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Ni mogoče določiti ustrezne vrste paketnega sistema"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Ni mogoče določiti %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "V sources.list morate vstaviti URI-je z viri"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Ni mogoče odprti ali razčleniti seznama paketov ali datoteke stanja."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Za odpravljanje težav poskusite zagnati apt-get update."
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Seznama virov ni mogoče brati."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Neveljaven zapis v datoteki možnosti %s, ni glave paketa"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Ni mogoče razumeti vrste bucike %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Prednost bucike ni navedena ali pa je nič."
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Predpomnilnik ima neustrezen sistem različic"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Prišlo je do napake med obdelavo %s (Nov paket)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Prišlo je do napake med obdelavo %s (Uporabi paket 1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Med obdelovanjem %s je prišlo do napake (NovOpisDatoteke1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Prišlo je do napake med obdelavo %s (Uporabi paket 2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Prišlo je do napake med obdelavo %s (Nova različica datoteke 1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Med obdelovanjem %s je prišlo do napake (NovaRazličica%d)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Prišlo je do napake med obdelavo %s (Uporabi paket 3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Med obdelovanjem %s je prišlo do napake (NovOpisDatoteke2)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Prišlo je do napake med obdelavo %s  (Najdi paket)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Čestitamo, presegli ste število imen paketov, ki jih zmore APT."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Čestitamo, presegli ste število različic, ki jih zmore APT."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Čestitamo, presegli ste število opisov, ki jih je zmožen APT."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 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:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Prišlo je do napake med obdelavo %s  (Najdi paket)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Prišlo je do napake med obdelavo %s (Zberi dobavitelje datotek)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Ni mogoče določiti seznama izvornih paketov %s"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Zbiranje dobaviteljev datotek"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "Napaka VI med shranjevanjem predpomnilnika virov"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "preimenovanje je spodletelo, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "Neujemanje vsote MD5"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Neujemanje vsote razpršil"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3049,28 +3037,28 @@ 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, 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:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3080,12 +3068,12 @@ msgstr ""
 "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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Napaka GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3094,7 +3082,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:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3103,7 +3091,7 @@ msgstr ""
 "Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno "
 "popraviti ta paket."
 
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3111,41 +3099,41 @@ msgstr ""
 "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket "
 "%s."
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Neujemanje velikosti"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Ni mogoče razčleniti Release datoteke %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Ni izbir v Release datoteki %s"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Ni vnosa razpršila v Release datoteki %s"
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Neveljaven vnos 'Veljavno-do' v Release datoteki %s"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Neveljavne vnos 'Datum' v Release datoteki %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Ponudnikov blok %s ne vsebuje prstnega podpisa"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3154,41 +3142,41 @@ msgstr ""
 "Uporabljanje CD-ROM-ove priklopne točke %s\n"
 "Priklapljanje CD-ROM-a\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Identificiranje ... "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Shranjena oznaka: %s\n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "Odklapljanje CD-ROM-a ...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Uporabljanje CD-ROM-ove priklopne točke %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Odklapljanje CD-ROM-a\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Čakanje na disk ...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Priklapljanje CD-ROM-a ...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Preiskovanje diska za datoteke kazala ..\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3197,7 +3185,7 @@ msgstr ""
 "Najdenih je bilo %zu kazal paketov, %zu kazal virov, %zu kazalov prevodov in "
 "%zu podpisov\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3205,16 +3193,16 @@ msgstr ""
 "Nobenih datotek paketov ni mogoče najti, morda to ni disk Debian ali pa je "
 "arhitektura napačna?"
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Najdena je bila oznaka '%s'\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "To ni veljavno ime, poskusite znova.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3223,92 +3211,92 @@ msgstr ""
 "Ta disk se imenuje: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Kopiranje seznama paketov ..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Pisanje novega seznama virov\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "Izvorni vnosi za ta disk so:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Zapisanih je bilo %i zapisov.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, 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:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Zapisanih je bilo %i zapisov z %i manjkajočimi datotekami in %i "
 "neujemajočimi datotekami.\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Preskok neobstoječe datoteke %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Ni mogoče najti zapisa overitve za: %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Neujemanje razpršila za: %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "V %s ni nameščenih zbirk ključev."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Izdaje '%s' za '%s' ni mogoče najti"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Različice '%s' za '%s' ni mogoče najti"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Ni mogoče najti naloge '%s'"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "Ni mogoče izbrati različic in paketa '%s', saj je popolnoma navidezen"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3317,125 +3305,149 @@ msgstr ""
 "Ni mogoče izbrati nameščene različice ali različice kandidata iz paketa "
 "'%s', saj nima nobenega od njiju"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Ni mogoče izbrati najnovejše različice iz paketa '%s', saj je popolnoma "
 "navidezen"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr "Ni mogoče izbrati različice kandidata iz paketa %s, ker nima kandidata"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr "Ni mogoče izbrati nameščene različice iz paketa %s, saj ni nameščen"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "Nameščanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Nastavljanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Odstranjevanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "%s je bil popolnoma odstranjen"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "%s je izginil"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Mapa '%s' manjka"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Ni mogoče odpreti datoteke '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Pripravljanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Razširjanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Pripravljanje na nastavljanje %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "%s je bil nameščen"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Pripravljanje na odstranitev %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "%s je bil odstranjen"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Pripravljanje na popolno odstranitev %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "%s je bil popolnoma odstranjen"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "Poganjanje dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "težave odvisnosti - puščanje nenastavljenega"
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3443,7 +3455,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:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3451,7 +3463,7 @@ msgstr ""
 "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
 "polnega diska"
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3459,14 +3471,14 @@ msgstr ""
 "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
 "zaradi pomanjkanja pomnilnika"
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
 "dpkg V/I"
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3474,43 +3486,43 @@ msgid ""
 msgstr ""
 "Skrbniške mape (%s) ni mogoče zakleniti. Jo morda uporablja drugo opravilo?"
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Skrbniške mape (%s) ni mogoče zakleniti. Ali ste skrbnik?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. "
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Ni zaklenjeno"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "Datoteke zrcalnih strežnikov '%s' ni mogoče najti "
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Datoteke zrcalnih strežnikov '%s' ni mogoče najti "
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Zrcalni strežnik: %s]"
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3519,7 +3531,7 @@ msgstr ""
 "%s ni mogoče zakrpati z mmap in z uporabo opravila datotek - popravek je "
 "videti pokvarjen"
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3528,10 +3540,68 @@ msgstr ""
 "%s ni mogoče zakrpati z mmap (toda napaka ni specifična za mmap) - popravek "
 "je videti pokvarjen."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Povezava se je prezgodaj zaprla"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Opomba: To je dpkg storil samodejno in namenoma."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Napačno oblikovana prepisana vrstica %s %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Napačno oblikovana prepisana vrstica %s %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Napačno oblikovanje prepisane vrstice %s %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "program za razširjanje"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "branje, še vedno %lu za branje, a nobeden ni ostal"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "pisanje, še vedno %lu za pisanje, a ni mogoče"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "Ni mogoče izvesti takojąnje nastavitve že razpakiranega '%s'. Oglejte si "
+#~ "man 5 apt.conf pod APT::Takojšnja-Nastavitev za podrobnosti"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Prišlo je do napake med obdelavo %s (Nov paket)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Prišlo je do napake med obdelavo %s (Uporabi paket 1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Med obdelovanjem %s je prišlo do napake (NovOpisDatoteke1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Prišlo je do napake med obdelavo %s (Uporabi paket 2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Prišlo je do napake med obdelavo %s (Nova različica datoteke 1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Med obdelovanjem %s je prišlo do napake (NovaRazličica%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Prišlo je do napake med obdelavo %s (Uporabi paket 3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Med obdelovanjem %s je prišlo do napake (NovOpisDatoteke2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Prišlo je do napake med obdelavo %s  (Najdi paket)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Prišlo je do napake med obdelavo %s (Zberi dobavitelje datotek)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Notranja napaka. Ni mogoče najti člana."
 
diff --git a/po/sv.po b/po/sv.po
index b999d7591..a7e4d48cb 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -19,150 +19,151 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 "Paketet %s med version %s har ett beroende som inte kan tillfredsställas:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Totalt antal paketnamn: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Totala paketstrukturer: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Vanliga paket: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Helt virtuella paket: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Enstaka virtuella paket: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Blandade virtuella paket: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Saknade: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Totalt antal olika versioner: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Totalt antal olika beskrivningar: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Totalt antal beroenden: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Totalt antal version/filrelationer: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Totalt antal beskrivning/filrelationer: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Totalt antal tillhandahållningsmarkeringar: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Totalt antal sökmönstersträngar: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Totalt utrymme för versionsberoenden: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Totalt bortkastat utrymme: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Totalt utrymme som kan redogöras för: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Paketfilen %s är inte synkroniserad."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Inga paket hittades"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "Du måste ange minst ett sökmönster"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Kunde inte hitta paketet %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "\"Package\"-filer:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Fastnålade paket:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(hittades inte)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Installerad: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Paketnålning: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Versionstabell:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -236,28 +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:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 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:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Misslyckades med att montera \"%s\" till \"%s\""
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 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."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Argumenten gavs inte parvis"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -285,12 +286,12 @@ 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:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s är inte ett giltigt DEB-paket."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -314,40 +315,40 @@ 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:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Kunde inte skriva till %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Kan inte ta reda på debconf-version. Är debconf installerat?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Listan över filtillägg för Packages är för lång"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Fel vid behandling av katalogen %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Listan över filtillägg för Sources är för lång"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Fel vid skrivning av rubrik till innehållsfil"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Fel vid behandling av innehållet %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -428,26 +429,26 @@ msgstr ""
 "  -c=?  Läs denna konfigurationsfil\n"
 "  -o=?  Ställ in en godtycklig konfigurationsflagga"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Inga val träffades"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Några filer saknas i paketfilsgruppen \"%s\""
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "DB var skadad, filen omdöpt till %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB är gammal, försöker uppgradera %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -455,114 +456,114 @@ msgstr ""
 "DB-formatet är ogiltigt. Ta bort och återskapa databasen om du uppgraderar "
 "från en äldre version av apt."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Kunde inte öppna DB-filen %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Misslyckades med att ta status på %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Arkivet har ingen styrpost"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Kunde inte få tag i någon markör"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "V: Kunde inte läsa katalogen %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "V: Kunde inte ta status på %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "F: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "V: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "F: Felen gäller filen "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Misslyckades med att slå upp %s"
 
 # ???
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Trädvandring misslyckades"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Misslyckades med att öppna %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " Avlänka %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Misslyckades med att läsa länken %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Misslyckades med att länka ut %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Misslyckades med att länka %s till %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, 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:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Arkivet har inget package-fält"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, 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:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  ansvarig för paketet %s är %s ej %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s har ingen källåsidosättningspost\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s har heller ingen binär åsidosättningspost\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Misslyckades med att allokera minne"
 
@@ -573,18 +574,18 @@ msgstr "Kunde inte öppna %s"
 
 # parametrar: filnamn, radnummer
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Felaktig override %s rad %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Felaktig override %s rad %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Felaktig override %s rad %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -592,64 +593,52 @@ msgstr "Felaktig override %s rad %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "Misslyckades med att läsa åsidosättningsfilen %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Okänd komprimeringsalgoritm \"%s\""
 
 # ???
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Komprimerade utdata %s behöver en komprimeringsuppsättning"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Misslyckades med att skapa IPC-rör till underprocess"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Misslyckades med att skapa FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Misslyckades med att grena process"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Barnprocess för komprimering"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Internt fel, misslyckades med att skapa %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Misslyckades med att skapa underprocess-IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Misslyckades med att starta komprimerare "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "uppackare"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "In/ut för underprocess/fil misslyckades"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Misslyckades med att läsa vid beräkning av MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Problem med att länka ut %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Misslyckades med att byta namn på %s till %s"
@@ -658,75 +647,79 @@ msgstr "Misslyckades med att byta namn på %s till %s"
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Fel vid kompilering av reguljärt uttryck - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "men %s är installerat"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "men %s kommer att installeras"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "men det kan inte installeras"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "men det är ett virtuellt paket"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "men det är inte installerat"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "men det kommer inte att installeras"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " eller"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Följande NYA paket kommer att installeras:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Följande paket kommer att TAS BORT:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Följande paket har hållits tillbaka:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Följande paket kommer att uppgraderas:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Följande paket kommer att NEDGRADERAS:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Följande tillbakahållna paket kommer att ändras:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (på grund av %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -734,59 +727,59 @@ msgstr ""
 "VARNING: Följande systemkritiska paket kommer att tas bort.\n"
 "Detta bör INTE genomföras såvida du inte vet exakt vad du gör!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu att uppgradera, %lu att nyinstallera, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu att installera om, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu att nedgradera, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu att ta bort och %lu att inte uppgradera.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu är inte helt installerade eller borttagna.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Observera, väljer \"%s\" för funktionen \"%s\"\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Observera, väljer \"%s\" för det reguljära uttrycket \"%s\"\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Paketet %s är ett virtuellt paket som tillhandahålls av:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Installerat]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr " [Inte kandidatversion]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Du bör uttryckligen ange ett att installera."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -797,129 +790,129 @@ msgstr ""
 "Det kan betyda att paketet saknas, har blivit föråldrat eller endast\n"
 "är tillgängligt från andra källor\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Dock kan följande paket ersätta det:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Paketet \"%s\" har ingen installationskandidat"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "Virtuella paket som \"%s\" kan inte tas bort\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Observera, väljer \"%s\" istället för \"%s\"\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Hoppar över %s, det är inte installerat och endast uppgraderingar har "
 "begärts.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s är redan den senaste versionen.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s är satt till manuellt installerad.\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Valde version \"%s\" (%s) för \"%s\"\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Valde version \"%s\" (%s) för \"%s\"\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Paketet %s är inte installerat, så det tas inte bort\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Korrigerar beroenden...."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " misslyckades."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Kunde inte korrigera beroenden"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Kunde inte minimera uppgraderingsuppsättningen"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Färdig"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Du bör köra \"apt-get -f install\" för att korrigera dessa."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Otillfredsställda beroenden. Prova med -f."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "VARNING: Följande paket kunde inte autentiseras!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Autentiseringsvarning åsidosatt.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Installera dessa paket utan verifiering [j/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Några av paketen kunde inte autentiseras"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Problem har uppstått och -y användes utan --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Internt fel. InstallPackages anropades med trasiga paket!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Paketen måste tas bort men \"Remove\" är inaktiverat."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Internt fel. Sorteringen färdigställdes inte"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Konstigt.. storlekarna stämde inte överens, skicka e-post till apt@packages."
@@ -927,21 +920,21 @@ 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Behöver hämta %sB/%sB arkiv.\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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Behöver hämta %sB arkiv.\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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -949,31 +942,31 @@ 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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 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:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kunde inte fastställa ledigt utrymme i %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s"
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Ja, gör som jag säger!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -985,28 +978,28 @@ msgstr ""
 " ?] "
 
 # Visas då man svarar nej
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Avbryter."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vill du fortsätta [J/n]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Misslyckades med att hämta %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Misslyckades med att hämta vissa filer"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Hämtningen färdig i \"endast-hämta\"-läge"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1014,19 +1007,19 @@ msgstr ""
 "Vissa arkiv kunte inte hämtas. Prova att köra \"apt-get update\" eller med --"
 "fix-missing."
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing och mediabyte stöds inte för tillfället"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Kunde inte korrigera saknade paket."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Avbryter installationen."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1040,36 +1033,36 @@ msgstr[1] ""
 "Följande paket har försvunnit från ditt system eftersom\n"
 "alla filer har skrivits över av andra paket:"
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Observera: Detta sker med automatik och vid behov av dpkg."
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Ignorera otillgängliga målutgåvan \"%s\" av paketet \"%s\""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Väljer \"%s\" som källkodspaket istället för \"%s\"\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Ignorera otillgängliga versionen \"%s\" av paketet \"%s\""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Uppdateringskommandot tar inga argument"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Det är inte meningen att vi ska ta bort något, kan inte starta AutoRemover"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1087,15 +1080,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 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:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Internt fel, AutoRemover förstörde något"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1106,7 +1099,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Följande paket har installerats automatiskt och är inte längre nödvändiga:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1116,19 +1109,19 @@ msgstr[0] ""
 msgstr[1] ""
 "%lu paket blev installerade automatiskt och är inte längre nödvändiga.\n"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Använd \"apt-get autoremove\" för att ta bort dem."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Internt fel, AllUpgrade förstörde något"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Du bör köra \"apt-get -f install\" för att korrigera dessa:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1136,7 +1129,7 @@ msgstr ""
 "Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket "
 "(eller ange en lösning)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1148,73 +1141,73 @@ msgstr ""
 "att några nödvändiga paket ännu inte har skapats eller flyttats\n"
 "ut från \"Incoming\"."
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Trasiga paket"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Följande ytterligare paket kommer att installeras:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Föreslagna paket:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Rekommenderade paket:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kunde inte hitta paketet %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s är satt till automatiskt installerad.\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Beräknar uppgradering... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Färdig"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Internt fel, problemlösaren förstörde någonting"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Kunde inte låsa hämtningskatalogen"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 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:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, 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:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1224,7 +1217,7 @@ msgstr ""
 "på:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1235,85 +1228,85 @@ msgstr ""
 "bzr get %s\n"
 "för att hämta senaste (möjligen inte utgivna) uppdateringar av paketet.\n"
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hoppar över redan hämtade filen \"%s\"\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Behöver hämta %sB källkodsarkiv.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hämtar källkoden %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Misslyckades med att hämta vissa arkiv."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, 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:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggkommandot \"%s\" misslyckades.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Barnprocessen misslyckades"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 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:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, 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:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har inga byggberoenden.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1322,7 +1315,7 @@ msgstr ""
 "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
 "hittas"
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1331,14 +1324,14 @@ msgstr ""
 "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
 "hittas"
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1347,7 +1340,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:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1356,31 +1349,31 @@ msgstr ""
 "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
 "hittas"
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, 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:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggberoenden för %s kunde inte tillfredsställas."
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Misslyckades med att behandla byggberoenden"
 
 # Felmeddelande för misslyckad chdir
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Ansluter till %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Moduler som stöds:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1468,7 +1461,7 @@ msgstr ""
 "för mer information och flaggor.\n"
 "                     Denna APT har Speciella Ko-Krafter.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1482,36 +1475,36 @@ msgstr ""
 
 # Måste vara tre bokstäver(?)
 # "Hit" = aktuell version är fortfarande giltig
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Bra "
 
 # "Get:" = hämtar ny version
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Läs:"
 
 # "Ign" = hoppar över
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ign "
 
 # "Err" = fel vid hämtning
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Fel "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Hämtade %sB på %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Arbetar]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1522,46 +1515,62 @@ msgstr ""
 " \"%s\"\n"
 "i enheten \"%s\" och tryck på Enter\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "men det är inte installerat"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s är satt till manuellt installerad.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s är satt till automatiskt installerad.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s är redan den senaste versionen.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s är redan den senaste versionen.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s är satt till manuellt installerad.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Misslyckades med att öppna %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1583,11 +1592,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Okänd paketpost!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1649,197 +1658,199 @@ msgstr "meddelandet är viktiga. Försök korrigera dem och kör [I]nstallera ig
 msgid "Merging available information"
 msgstr "Sammanfogar tillgänglig information"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Misslyckades med att skapa rör"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Misslyckades med att köra gzip"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Skadat arkiv"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar-kontrollsumma misslyckades, arkivet skadat"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Okänd TAR-rubriktyp %u, del %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Ogiltig arkivsignatur"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Fel vid läsning av rubrik för arkivdel"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "Ogiltig arkivdelsrubrik %s"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Ogiltigt arkivdelsrubrik"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Arkivet är för kort"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Misslyckades med att läsa arkivrubriker"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "DropNode anropat på fortfarande länkad nod"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Misslyckades med att hitta hash-elementet!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Misslyckades med att allokera omdirigering"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Internt fel i AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Försöker att skriva över en omdirigering, %s -> %s och %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Omdirigeringen %s -> %s inlagd två gånger"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Duplicerad konfigurationsfil %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Misslyckades med att skriva filen %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Misslyckades med att stänga filen %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Sökvägen %s är för lång"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Packar upp %s flera gånger"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Katalogen %s är omdirigerad"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Omdirigeringssökvägen är för lång"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "Misslyckades med att hitta noden i sin hashkorg"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Sökvägen är för lång"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, 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:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Filen %s/%s skriver över den i paketet %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Kunde inte läsa %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Kunde inte ta status på %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Misslyckades med att ta bort %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Kunde inte skapa %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Misslyckades att ta status på %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Katalogerna info och temp måste vara på samma filsystem"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Läser paketlistor"
 
 # Felmeddelande för misslyckad chdir
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Misslyckades att växla till adminkatalogen %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Internt fel när namn på Package-fil skulle hämtas"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Läser fillista"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1849,115 +1860,116 @@ msgstr ""
 "Misslyckades med att öppna listfilen \"%sinfo/%s\". Om du inte kan återskapa "
 "filen, skapa en tom och installera omedelbart om samma version av paketet!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Misslyckades med att läsa listfilen %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Internt fel när en nod skulle hämtas"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Misslyckades med att öppna omdirigeringsfilen %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "Omdirigeringsfilen är skadad"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Felaktig rad i omdirigeringsfilen: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Internt fel när en omdirigering skulle läggas till"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "Paketcachen måste först initieras"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Misslyckades med att hitta Package:-rubrik, position %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Felaktig ConfFile-sektion i statusfilen. Position %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Fel vid tolkning av MD5. Position %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Detta är inte ett giltigt DEB-arkiv, delen \"%s\" saknas"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 "Detta är inte ett giltigt DEB-arkiv, \"%s\", \"%s\" och \"%s\" saknas"
 
 # chdir
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Kunde inte byta till %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Internt fel, kunde inta hitta delen %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Misslyckades med att hitta en giltig control-fil"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Kunde inte tolka control-filen"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Kunde inte öppna rör för %s"
 
 # %s = programnamn
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Läsfel från %s-processen"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Kunde inte ta status"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Misslyckades ställa in ändringstid"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Kunde inte läsa cd-rom-databasen %s"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1965,56 +1977,56 @@ msgstr ""
 "Använd apt-cdrom för att APT ska känna igen denna cd. apt-get update kan "
 "inte användas för att lägga till skivor"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "Fel cd-rom"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande används."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Skivan hittades inte."
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Filen hittades inte"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Ogiltig URI, lokala URI:er får inte börja med //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Loggar in"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Kunde inte fastställa namnet på partnern"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Kunde inte fastställa det lokala namnet"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Servern nekade anslutningen och sade: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER misslyckades, servern sade: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS misslyckades, servern sade: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2022,203 +2034,203 @@ msgstr ""
 "En mellanserver (proxy) angavs men inget inloggningsskript, Acquire::ftp::"
 "ProxyLogin är tom."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Kommandot \"%s\" i inloggningsskriptet misslyckades, servern sade: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE misslyckades, servern sade: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Tidsgränsen för anslutningen överskreds"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Servern stängde anslutningen"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Läsfel"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Ett svar spillde bufferten."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Protokollet skadat"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Skrivfel"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Kunde inte skapa ett uttag (socket)"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "Kunde inte ansluta datauttaget (socket), inget svar inom tidsgräns"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Kunde inte ansluta passivt uttag (socket)."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo kunde inte få tag i ett lyssnande uttag (socket)"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Kunde inte binda ett uttag (socket)"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Kunde inte lyssna på uttaget (socket)"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Kunde inte fastställa uttagets namn (socket)"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Kunde inte sända PORT-kommando"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Okänd adressfamilj %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT misslyckades, servern sade: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Kunde inte ta emot anslutningen"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Problem med att lägga filen till hashtabellen"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Kunde inte hämta filen, servern sade \"%s\""
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Datauttag (socket) fick inte svar inom tidsgränsen"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Dataöverföringen misslyckades, servern sade \"%s\""
 
 # Statusmeddelande, byter från substantiv till verb
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Frågar"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Kunde inte starta "
 
 # Felmeddelande för misslyckad chdir
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Ansluter till %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 # [f]amilj, [t]yp, [p]rotokoll
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Kunde inte initiera anslutningen till %s:%s (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Ansluter till %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Kunde inte slå upp \"%s\""
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Temporärt fel vid uppslagning av \"%s\""
 
 # Okänd felkod; %i = koden
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, 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:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Kunde inte ansluta till %s:%s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Minst en ogiltig signatur träffades på."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Okänt fel vid körning av gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Följande signaturer är ogiltiga:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2226,106 +2238,111 @@ msgstr ""
 "Följande signaturer kunde inte verifieras för att den öppna nyckeln inte är "
 "tillgänglig:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Väntar på rubriker"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Fick en ensam rubrikrad på %u tecken"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Felaktig rubrikrad"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http-servern sände ett ogiltigt svarshuvud"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http-servern sände ett ogiltigt Content-Length-rubrik"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http-servern sände ett ogiltigt Content-Range-rubrik"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Okänt datumformat"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "\"Select\" misslyckades"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Anslutningen överskred tidsgränsen"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Fel vid skrivning till utdatafil"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Fel vid skrivning till fil"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Fel vid skrivning till filen"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 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:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Fel vid läsning från server"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Misslyckades med att kapa av filen"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Felaktiga data i huvud"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Anslutningen misslyckades"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Kan inte utföra mmap på en tom fil"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Kunde inte duplicera filhandtag %i"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Kunde inte utföra mmap på %lu byte"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "Kunde inte stänga mmap"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "Kunde inte synkronisera mmap"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Kunde inte utföra mmap på %lu byte"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Misslyckades med att kapa av filen"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2334,7 +2351,7 @@ msgstr ""
 "Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Limit. "
 "Aktuellt värde: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2343,7 +2360,7 @@ msgstr ""
 "Kunde inte öka storleken för MMap eftersom gränsen på %lu byte redan har "
 "uppnåtts."
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2374,93 +2391,93 @@ msgstr "%limin %lis"
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Valet %s hittades inte"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Okänd typförkortning: \"%c\""
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Öppnar konfigurationsfilen %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaxfel %s:%u: Block börjar utan namn."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntaxfel %s:%u: Felformat märke"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntaxfel %s:%u: Överflödigt skräp efter värde"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Syntaxfel %s:%u: Direktiv kan endast utföras på toppnivån"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntaxfel %s:%u: För många nästlade inkluderingar"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntaxfel %s:%u: Inkluderad härifrån"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stöds inte"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr "Syntaxfel %s:%u: clear-direktivet kräver ett flaggträd som argument"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntaxfel %s:%u: Överflödigt skräp vid filens slut"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Fel!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Färdig"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Kommandoradsflaggan \"%c\" [från %s] är inte känd."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Förstår inte kommandoradsflaggan %s"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Kommandoradsflaggan %s är inte boolsk"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Flaggan %s kräver ett argument."
@@ -2471,340 +2488,353 @@ msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 "Flaggan %s: Den angivna konfigurationsposten måste innehålla ett =<värde>."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Flaggan %s kräver ett heltalsargument, inte \"%s\""
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Flaggan \"%s\" är för lång"
 
-#: 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 "Förstår inte %s, prova med \"true\" eller \"false\"."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Felaktig åtgärd %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Kunde inte ta status på monteringspunkten %s."
 
 # Felmeddelande för misslyckad chdir
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Kunde inte byta till %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Kunde inte ta status på cd-romen."
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Kunde inte öppna låsfilen %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Kunde inte erhålla låset %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Väntade på %s men den fanns inte där"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, 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:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Underprocessen %s tog emot signal %u."
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprocessen %s svarade med en felkod (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprocessen %s avslutades oväntat"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Kunde inte öppna filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Kunde inte öppna filhandtag %d"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Misslyckades med att skapa underprocess-IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Misslyckades med att starta komprimerare "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, 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:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, 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:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problem med att stänga gzip-filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem med att stänga filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, 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:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem med att avlänka filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Problem med att synkronisera filen"
 
 # Felmeddelande
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Paketcachen är tom"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Paketcachefilen är skadad"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "Paketcachefilens version är inkompatibel"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Paketcachefilen är skadad"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Denna APT saknar stöd för versionssystemet \"%s\""
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "Paketcachen byggdes för en annan arkitektur"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Beroende av"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Förberoende av"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Föreslår"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Rekommenderar"
 
 # "Konfliktar"?
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Står i konflikt med"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Ersätter"
 
 # "Föråldrar"?
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Föråldrar"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Gör sönder"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "Utökar"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "viktigt"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "nödvändigt"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "valfri"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Bygger beroendeträd"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Kandiderande versioner"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Beroendegenerering"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Läser tillståndsinformation"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Misslyckades med att öppna StateFile %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Misslyckades med att skriva temporär StateFile %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Kunde inte tolka paketfilen %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Kunde inte tolka paketfilen %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "Rad %lu i källistan %s har fel format ([option] ej tolkningsbar)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Rad %lu i källistan %s har fel format ([option] för kort)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Rad %lu i källistan %s har fel format ([%s] är inte en tilldelning)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Rad %lu i källistan %s har fel format ([%s] saknar nyckel)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "Rad %lu i källistan %s har fel format ([%s] nyckeln %s saknar värde)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Rad %lu i källistan %s har  (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Rad %lu i källistan %s har fel format (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Rad %lu i källistan %s har fel format (Absolut dist)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Öppnar %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 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:281
+#: apt-pkg/sourcelist.cc:285
 #, 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:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2813,7 +2843,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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Kunde inte öppna filen \"%s\""
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2825,28 +2860,19 @@ msgstr ""
 "Detta är oftast en dålig idé, men om du verkligen vill göra det kan du "
 "aktivera flaggan \"APT::Force-LoopBreak\"."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"Kunde inte genomföra omedelbar konfiguration på redan uppackade \"%s\". Se "
-"man 5 apt.conf under APT::Immediate-Configure för information."
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Indexfiler av typ \"%s\" stöds inte"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 "Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2854,11 +2880,11 @@ msgstr ""
 "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på "
 "tillbakahållna paket."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 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:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2867,81 +2893,81 @@ msgstr ""
 "Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla "
 "använts istället."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Listkatalogen %spartial saknas."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Arkivkatalogen %spartial saknas."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "Kunde inte låsa katalogen %s"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Hämtar fil %li av %li (%s återstår)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Hämtar fil %li av %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Metoddrivrutinen %s kunde inte hittas."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s startade inte korrekt"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Paketsystemet \"%s\" stöds inte"
 
 #
-#: apt-pkg/init.cc:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Kunde inte fastställa en lämplig paketsystemstyp"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Kunde inte ta status på %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Du måste lägga till några \"source\"-URI:er i din sources.list"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Paketlistan eller statusfilen kunde inte tolkas eller öppnas."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Du kan möjligen rätta till problemet genom att köra \"apt-get update\""
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Listan över källor kunde inte läsas."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, c-format
 msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
@@ -2949,155 +2975,116 @@ msgid ""
 msgstr ""
 
 # "Package" är en sträng i konfigurationsfilen
-#: apt-pkg/policy.cc:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Ogiltig post i konfigurationsfilen %s, \"Package\"-rubriken saknas"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Förstod inte nåltypen %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Prioritet ej angiven (eller noll) för nål"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Cachen har ett inkompatibelt versionssystem"
 
 # NewPackage etc. är funktionsnamn
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Fel uppstod vid hantering av %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Fel uppstod vid hantering av %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Fel uppstod vid hantering av %s (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Fel uppstod vid hantering av %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Fel uppstod vid hantering av %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Fel uppstod vid behandling av %s (NewVersion%d)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Fel uppstod vid hantering av %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Fel uppstod vid hantering av %s (NewFileDesc2)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Fel uppstod vid hantering av %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Grattis, du överskred antalet paketnamn som denna APT kan hantera."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Grattis, du överskred antalet versioner som denna APT kan hantera."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Grattis, du överskred antalet beskrivningar som denna APT kan hantera."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Grattis, du överskred antalet beroenden som denna APT kan hantera."
 
-# NewPackage etc. är funktionsnamn
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Fel uppstod vid hantering av %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Fel uppstod vid hantering av %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Kunde inte ta status på källkodspaketlistan %s"
 
 # Bättre ord?
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Samlar filtillhandahållningar"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "In-/utfel vid lagring av källcache"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "namnbyte misslyckades, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "MD5-kontrollsumman stämmer inte"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Hash-kontrollsumman stämmer inte"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, 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:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3108,12 +3095,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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-fel: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3122,7 +3109,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:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3131,47 +3118,47 @@ 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:1753
+#: apt-pkg/acquire-item.cc:1768
 #, 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:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Storleken stämmer inte"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Kunde inte tolka \"Release\"-filen %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Inga sektioner i Release-filen %s"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "Ingen Hash-post i Release-filen %s"
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Ogiltig \"Valid-Until\"-post i Release-filen %s"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ogiltig \"Date\"-post i Release-filen %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Leverantörsblocket %s saknar fingeravtryck"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3180,41 +3167,41 @@ msgstr ""
 "Använder cd-rom-monteringspunkten %s\n"
 "Monterar cd-rom\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Identifierar.. "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Lagrad etikett: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "Avmonterar cd-rom...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Använder cd-rom-monteringspunkten %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Avmonterar cd-rom\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Väntar på skiva...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Monterar cd-rom...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Söker efter indexfiler på skivan...\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3223,7 +3210,7 @@ msgstr ""
 "Hittade %zu paketindex, %zu källkodsindex, %zu översättningsindex och %zu "
 "signaturer\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3231,16 +3218,16 @@ msgstr ""
 "Kunde inte hitta några paketfiler. Detta är kanske inte en Debian-skiva "
 "eller felaktig arkitektur?"
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Hittade etiketten \"%s\"\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Namnet är ogiltigt, försök igen.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3249,91 +3236,91 @@ msgstr ""
 "Denna skiva heter: \n"
 "\"%s\"\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Kopierar paketlistor..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Skriver ny källista\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "Poster i källistan för denna skiva:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skrev %i poster.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skrev %i poster med %i saknade filer.\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, 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"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Hoppar över icke-existerande filen %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Kan inte hitta autentiseringspost för: %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash-kontrollsumman stämmer inte för: %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "Ingen nyckelring installerad i %s."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Utgåvan \"%s\" för \"%s\" hittades inte"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Version \"%s\" för \"%s\" hittades inte"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Kunde inte hitta funktionen \"%s\""
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Kan inte välja versioner från paketet \"%s\" eftersom det är helt virtuellt"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3342,127 +3329,151 @@ msgstr ""
 "Kan inte välja installerad version eller kandidatversion från paketet \"%s\" "
 "eftersom det inte har någon av dem"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Kan inte välja senaste version från paketet \"%s\" eftersom det är helt "
 "virtuellt"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Kan inte välja kandidatversion från paketet %s eftersom det inte har någon "
 "kandidat"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Kan inte välja installerad version från paketet %s eftersom det inte är "
 "installerat"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "Installerar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Konfigurerar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Tar bort %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "Tar bort hela %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Uppmärksammar försvinnandet av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Katalogen \"%s\" saknas"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Kunde inte öppna filen \"%s\""
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Förbereder %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Packar upp %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Förbereder konfigurering av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "Installerade %s"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Förbereder borttagning av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "Tog bort %s"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Förbereder borttagning av hela %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "Tog bort hela %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "Kör dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "beroendeproblem - lämnar okonfigurerad"
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3470,7 +3481,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:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3478,7 +3489,7 @@ msgstr ""
 "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
 "diskutrymmet är slut"
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3486,14 +3497,14 @@ msgstr ""
 "Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet "
 "är slut"
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Ingen apport-rapport skrevs därför att felmeddelandet indikerar ett in-/ut-"
 "fel för dpkg"
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3501,44 +3512,44 @@ msgid ""
 msgstr ""
 "Kunde inte låsa administrationskatalogen (%s). Använder en annan process den?"
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Kunde inte låsa administrationskatalogen (%s). Är du root?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "dpkg avbröts. Du måste köra \"%s\" manuellt för att korrigera problemet. "
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Inte låst"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "Ingen spegelfil \"%s\" hittades "
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Ingen spegelfil \"%s\" hittades "
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Spegel: %s]"
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3547,7 +3558,7 @@ msgstr ""
 "Kunde inte patcha %s med mmap och med filoperationsanvändning - patchen "
 "verkar vara skadad."
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3556,10 +3567,71 @@ msgstr ""
 "Kunde inte patcha %s med mmap (men inga mmap-specifika fel) - patchen verkar "
 "vara skadad."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Anslutningen stängdes i förtid"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Observera: Detta sker med automatik och vid behov av dpkg."
+
+# parametrar: filnamn, radnummer
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Felaktig override %s rad %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Felaktig override %s rad %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Felaktig override %s rad %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "uppackare"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "skrivning, har fortfarande %lu att skriva men kunde inte"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "Kunde inte genomföra omedelbar konfiguration på redan uppackade \"%s\". "
+#~ "Se man 5 apt.conf under APT::Immediate-Configure för information."
+
+# NewPackage etc. är funktionsnamn
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Fel uppstod vid hantering av %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Fel uppstod vid hantering av %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Fel uppstod vid hantering av %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Fel uppstod vid hantering av %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Fel uppstod vid hantering av %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Fel uppstod vid behandling av %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Fel uppstod vid hantering av %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Fel uppstod vid hantering av %s (NewFileDesc2)"
+
+# NewPackage etc. är funktionsnamn
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Fel uppstod vid hantering av %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Fel uppstod vid hantering av %s (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Internt fel, kunde inte hitta del"
 
diff --git a/po/th.po b/po/th.po
index a1316d10e..54d221a86 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+0200\n"
 "PO-Revision-Date: 2008-11-06 15:54+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -17,151 +17,152 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "แพกเกจ %s รุ่น %s ขาดแพกเกจที่ต้องใช้:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "จำนวนชื่อแพกเกจทั้งหมด : "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 #, fuzzy
 msgid "Total package structures: "
 msgstr "จำนวนชื่อแพกเกจทั้งหมด : "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  แพกเกจปกติ: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  แพกเกจเสมือนแท้ๆ: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  แพกเกจเสมือนที่มีแพกเกจจริงเดียว: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  แพกเกจเสมือนผสม: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  แพกเกจที่ขาดหาย: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "จำนวนรุ่นที่แตกต่างกันทั้งหมด: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "จำนวนคำบรรยายแพกเกจที่แตกต่างกันทั้งหมด: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "จำนวนการเชื่อมโยงระหว่างแพกเกจทั้งหมด: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "จำนวนความสัมพันธ์ รุ่น/แฟ้ม ทั้งหมด: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "จำนวนความสัมพันธ์ คำบรรยาย/แฟ้ม ทั้งหมด: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "จำนวนผังการตระเตรียมทั้งหมด: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "จำนวนสตริงทั้งหมด: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "ขนาดของพื้นที่ความเชื่อมโยงระหว่างแพกเกจทั้งหมด: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "พื้นที่สำรองทั้งหมด: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "พื้นที่ที่นับรวมทั้งหมด: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "ข้อมูลแฟ้ม Package %s ไม่ตรงกับความเป็นจริง"
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "ไม่พบแพกเกจ"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "คุณต้องระบุแพตเทิร์นด้วย"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "ไม่พบแพกเกจ %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "แฟ้มแพกเกจ:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "ข้อมูลแคชไม่ตรงกับความเป็นจริงแล้ว ไม่สามารถอ้างอิงไขว้ระหว่างแฟ้มแพกเกจ"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "แพกเกจที่ถูกตรึง:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(ไม่พบ)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  ที่ติดตั้งอยู่: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  รุ่นที่ติดตั้งได้: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(ไม่มี)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  การตรึงแพกเกจ: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  ตารางรุ่น:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -234,29 +235,29 @@ msgstr ""
 "  -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
 "กรุณาอ่านข้อมูลเพิ่มเติมจาก manual page apt-cache(8) และ apt.conf(5)\n"
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 #, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "กรุณาตั้งชื่อแผ่น เช่น 'Debian 4.0r1 Disk 1'"
 
-#: cmdline/apt-cdrom.cc:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "กรุณาใส่แผ่นลงในไดรว์แล้วกด enter"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "ทำเช่นนี้ต่อไปกับแผ่นซีดีที่เหลือในชุด"
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "อาร์กิวเมนต์ไม่ได้ระบุเป็นคู่ๆ"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -284,12 +285,12 @@ msgstr ""
 "  -c=? อ่านแฟ้มค่าตั้งที่กำหนด\n"
 "  -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s ไม่ใช่แพกเกจ DEB ที่ใช้การได้"
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -313,40 +314,40 @@ msgstr ""
 "  -c=?  อ่านแฟ้มค่าตั้งนี้\n"
 "  -o=?  กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "ไม่สามารถอ่านรุ่นของ debconf ได้ ได้ติดตั้ง debconf ไว้หรือไม่?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "รายชื่อนามสกุลแพกเกจยาวเกินไป"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "รายชื่อนามสกุลซอร์สยาวเกินไป"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนข้อมูลส่วนหัวลงในแฟ้มสารบัญ"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "เกิดข้อผิดพลาดขณะประมวลผลสารบัญ %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -423,137 +424,137 @@ msgstr ""
 "  -c=?  อ่านแฟ้มค่าตั้งนี้\n"
 "  -o=?  กำหนดตัวเลือกค่าตั้งเป็นรายตัว"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "ไม่มีรายการเลือกที่ตรง"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "บางแฟ้มขาดหายไปในกลุ่มแฟ้มแพกเกจ `%s'"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "DB เสีย จะเปลี่ยนชื่อแฟ้มเป็น %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB เป็นรุ่นเก่า จะพยายามปรับรุ่น %s ขึ้น"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 #, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr "ฟอร์แมตของ DB ผิด ถ้าคุณเพิ่งปรับรุ่นมาจาก apt รุ่นเก่า กรุณาลบฐานข้อมูลแล้วสร้างใหม่"
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "ไม่สามารถเปิดแฟ้ม DB %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "stat %s ไม่สำเร็จ"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "แพกเกจไม่มีระเบียนควบคุม"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "ไม่สามารถนำตัวชี้ตำแหน่งมาใช้ได้"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: อ่านไดเรกทอรี %s ไม่สำเร็จ\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: stat %s ไม่สำเร็จ\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: ข้อผิดพลาดเกิดกับแฟ้ม "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "หาพาธเต็มของ %s ไม่สำเร็จ"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "เดินท่องต้นไม้ไม่สำเร็จ"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "เปิด %s ไม่สำเร็จ"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "readlink %s ไม่สำเร็จ"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "unlink %s ไม่สำเร็จ"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** ลิงก์ %s ไปยัง %s ไม่สำเร็จ"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB แล้ว\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s ไม่มีข้อมูล override\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: 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:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s ไม่มีข้อมูล override สำหรับซอร์ส\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - จองหน่วยความจำไม่สำเร็จ"
 
@@ -563,18 +564,18 @@ msgid "Unable to open %s"
 msgstr "ไม่สามารถเปิด %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -582,63 +583,51 @@ msgstr "แฟ้ม override %s ผิดรูปแบบที่บรร�
 msgid "Failed to read the override file %s"
 msgstr "ไม่สามารถอ่านแฟ้ม override %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "ไม่รู้จักอัลกอริทึมบีบอัด '%s'"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "ผลลัพธ์ของการบีบอัด %s ต้องมีชุดของการบีบอัดด้วย"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "ไม่สามารถสร้างไปป์ IPC ไปยังโพรเซสย่อย"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "สร้าง FILE* ไม่สำเร็จ"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "fork ไม่สำเร็จ"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "โพรเซสลูกสำหรับบีบอัด"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "ข้อผิดพลาดภายใน: ไม่สามารถสร้าง %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "สร้าง IPC ของโพรเซสย่อยไม่สำเร็จ"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "เรียกทำงานตัวบีบอัดไม่สำเร็จ"
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "ตัวคลายบีบอัด"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "IO ไปยังโพรเซสย่อยหรือแฟ้มล้มเหลว"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "อ่านแฟ้มไม่สำเร็จขณะคำนวณ MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "มีปัญหาขณะลบแฟ้ม %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s"
@@ -647,75 +636,79 @@ msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไป�
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "แต่รุ่นที่จะติดตั้งคือ %s"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "แต่ไม่สามารถติดตั้งได้"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "แต่ได้ติดตั้งไว้"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " หรือ"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "จะ *ลบ* แพกเกจต่อไปนี้:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "จะคงรุ่นแพกเกจต่อไปนี้:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (เนื่องจาก %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -723,60 +716,60 @@ msgstr ""
 "*คำเตือน*: แพกเกจที่จำเป็นต่อไปนี้จะถูกถอดถอน\n"
 "คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "ติดตั้งซ้ำ %lu, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "ปรับรุ่นลง %lu, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "หมายเหตุ: จะเลือก %s สำหรับนิพจน์เรกิวลาร์ '%s'\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "หมายเหตุ: จะเลือก %s สำหรับนิพจน์เรกิวลาร์ '%s'\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "แพกเกจ %s เป็นแพกเกจเสมือนที่ตระเตรียมโดย:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [ติดตั้งอยู่]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 #, fuzzy
 msgid " [Not candidate version]"
 msgstr "รุ่นแพกเกจที่มี"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "คุณควรเจาะจงเลือกแพกเกจใดแพกเกจหนึ่งเพื่อติดตั้ง"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -786,177 +779,177 @@ msgstr ""
 "ไม่มีแพกเกจ %s ให้ใช้ติดตั้ง แต่ถูกอ้างถึงโดยแพกเกจอื่น\n"
 "แพกเกจนี้อาจขาดหายไป หรือตกรุ่นไปแล้ว หรืออยู่ในแหล่งอื่น\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "อย่างไรก็ดี แพกเกจต่อไปนี้ได้แทนที่แพกเกจดังกล่าวไปแล้ว:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "แพกเกจ %s ไม่มีรุ่นที่จะใช้ติดตั้ง"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "หมายเหตุ: จะเลือก %s แทน %s\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "จะข้าม %s เนื่องจากแพกเกจติดตั้งไว้แล้ว และไม่มีการกำหนดให้ปรับรุ่น\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "จะข้าม %s เนื่องจากแพกเกจติดตั้งไว้แล้ว และไม่มีการกำหนดให้ปรับรุ่น\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "ไม่สามารถติดตั้ง %s ซ้ำได้ เนื่องจากไม่สามารถดาวน์โหลดได้\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "เลือกรุ่น %s (%s) สำหรับ %s แล้ว\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "เลือกรุ่น %s (%s) สำหรับ %s แล้ว\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "แพกเกจ %s ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "กำลังแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจ..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " ล้มเหลว"
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "ไม่สามารถแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจได้"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "ไม่สามารถจำกัดรายการปรับรุ่นให้น้อยที่สุดได้"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " เสร็จแล้ว"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "คุณอาจต้องเรียก 'apt-get -f install' เพื่อแก้ปัญหาเหล่านี้"
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "รายการแพกเกจที่ต้องใช้ไม่ครบ กรุณาลองใช้ตัวเลือก -f"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "*คำเตือน*: แพกเกจต่อไปนี้ไม่สามารถยืนยันแหล่งต้นตอได้!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "จะข้ามการเตือนเกี่ยวกับการยืนยันแหล่งต้นตอ\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "จะติดตั้งแพกเกจเหล่านี้โดยไม่ตรวจสอบหรือไม่ [y/N]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "มีบางแพกเกจไม่สามารถยืนยันแหล่งต้นตอได้"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "มีปัญหาบางประการ และมีการใช้ -y โดยไม่ระบุ --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "เกิดข้อผิดพลาดภายใน: มีการเรียก InstallPackages ด้วยแพกเกจที่เสีย!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "มีแพกเกจที่จำเป็นต้องถอดถอน แต่ถูกห้ามการถอดถอนไว้"
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "ข้อผิดพลาดภายใน: การเรียงลำดับไม่เสร็จสิ้น"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "แปลกประหลาด.. ขนาดไม่ตรงกัน กรุณาอีเมลแจ้ง apt@packages.debian.org"
 
 #. 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:1142
+#: cmdline/apt-get.cc:1156
 #, 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:1147
+#: cmdline/apt-get.cc:1161
 #, 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:1154
+#: cmdline/apt-get.cc:1168
 #, 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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "หลังจากการกระทำนี้ เนื้อที่บนดิสก์จะว่างเพิ่มอีก %sB\n"
 
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Trivial Only ถูกกำหนดไว้ แต่คำสั่งนี้ไม่ใช่คำสั่งเล็กน้อย"
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -967,28 +960,28 @@ msgstr ""
 "หากต้องการดำเนินการต่อ ให้พิมพ์ประโยค '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "เลิกทำ"
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?"
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "ไม่สามารถดาวน์โหลด %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -996,19 +989,19 @@ msgstr ""
 "ดาวน์โหลดบางแพกเกจไม่สำเร็จ บางที การเรียก apt-get update หรือลองใช้ตัวเลือก --fix-"
 "missing อาจช่วยได้"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "ยังไม่รองรับ --fix-missing พร้อมกับการเปลี่ยนแผ่น"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "ไม่สามารถแก้ปัญหาแพกเกจที่ขาดหายได้"
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "จะล้มเลิกการติดตั้ง"
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1018,35 +1011,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "apt ถูกกำหนดไม่ให้มีการลบใดๆ จึงไม่สามารถดำเนินการถอดถอนอัตโนมัติได้"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1064,15 +1057,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "เกิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1082,7 +1075,7 @@ msgid_plural ""
 msgstr[0] "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:"
 msgstr[1] "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1090,19 +1083,19 @@ msgid_plural ""
 msgstr[0] "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:"
 msgstr[1] "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "ใช้ 'apt-get autoremove' เพื่อลบแพกเกจดังกล่าวได้"
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "เกิดข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "คุณอาจเรียก 'apt-get -f install' เพื่อแก้ปัญหานี้ได้:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1110,7 +1103,7 @@ msgstr ""
 "มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ "
 "(หรือจะระบุทางแก้ก็ได้)"
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1121,80 +1114,80 @@ msgstr ""
 "หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n"
 "ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming"
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "แพกเกจมีปัญหา"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "แพกเกจที่แนะนำ:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "แพกเกจที่ควรใช้ร่วมกัน:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "ไม่พบแพกเกจ %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "กำลังคำนวณการปรับรุ่น... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "ล้มเหลว"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "เสร็จแล้ว"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด"
 
-#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1202,104 +1195,104 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ดาวน์โหลดซอร์ส %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม"
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n"
 
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n"
 
-#: cmdline/apt-get.cc:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "คำสั่ง build '%s' ล้มเหลว\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "โพรเซสลูกล้มเหลว"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build"
 
-#: cmdline/apt-get.cc:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s"
 
-#: cmdline/apt-get.cc:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, 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:2889
+#: cmdline/apt-get.cc:2924
 #, 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:2912
+#: cmdline/apt-get.cc:2947
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป"
 
-#: cmdline/apt-get.cc:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1308,37 +1301,37 @@ msgstr ""
 "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s "
 "รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้"
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, 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:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s"
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้"
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "เชื่อมต่อไปยัง %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "มอดูลที่รองรับ:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1424,7 +1417,7 @@ msgstr ""
 "และ apt.conf(5)\n"
 "                       APT นี้มีพลังของ Super Cow\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1432,33 +1425,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "เจอ "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "ดึง:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "ข้าม "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "ปัญหา "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "ดาวน์โหลด %sB ใน %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [กำลังทำงาน]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1469,46 +1462,62 @@ msgstr ""
 " '%s'\n"
 "ลงในไดรว์ %s แล้วกด enter\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "แต่ได้ติดตั้งไว้"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "เปิด %s ไม่สำเร็จ"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1530,11 +1539,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "พบระเบียนแพกเกจที่ไม่รู้จัก!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1594,196 +1603,198 @@ msgstr "กรุณาแก้ปัญหาเหล่านั้น แ�
 msgid "Merging available information"
 msgstr "กำลังผสานรายชื่อแพกเกจที่มี"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "สร้างไปป์ไม่สำเร็จ"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "เรียก gzip ไม่สำเร็จ"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "แฟ้มจัดเก็บเสียหาย"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "checksum ของแฟ้ม tar ผิดพลาด แฟ้มจัดเก็บเสียหาย"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "พบชนิด %u ของข้อมูลส่วนหัว TAR ที่ไม่รู้จัก ที่สมาชิก %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "เอกลักษณ์ archive ไม่ถูกต้อง"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลส่วนหัวของสมาชิก archive"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, fuzzy, c-format
 msgid "Invalid archive member header %s"
 msgstr "ข้อมูลส่วนหัวของสมาชิก archive ไม่ถูกต้อง"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "ข้อมูลส่วนหัวของสมาชิก archive ไม่ถูกต้อง"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "archive สั้นเกินไป"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "อ่านข้อมูลส่วนหัวของ archive ไม่สำเร็จ"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "DropNode ถูกเรียกใช้กับโหนดที่ยังลิงก์อยู่"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "หาสมาชิกในตารางแฮชไม่สำเร็จ!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "จองเนื้อที่สำหรับ diversion ไม่สำเร็จ"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "ข้อผิดพลาดภายในที่ AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "พยายามเขียนทับ diversion: %s -> %s กับ %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "เพิ่ม diversion %s -> %s ซ้ำสอง"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "แฟ้มค่าตั้ง %s/%s ซ้ำ"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "ไม่สามารถเขียนแฟ้ม %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "ไม่สามารถปิดแฟ้ม %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "พาธ %s ยาวเกินไป"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "พยายามแตกแพกเกจ %s มากกว่าหนึ่งครั้ง"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "ไดเรกทอรี %s ถูก divert"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "แพกเกจนี้พยายามเขียนลงปลายทางของ diversion %s/%s"
 
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "พาธของ diversion ยาวเกินไป"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "ไดเรกทอรี %s กำลังจะถูกแทนที่ด้วยสิ่งที่ไม่ใช่ไดเรกทอรี"
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "หาโหนดใน bucket ของแฮชไม่พบ"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "พาธยาวเกินไป"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "พบแพกเกจที่เขียนทับโดยไม่มีข้อมูลรุ่นสำหรับ %s"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "แฟ้ม %s/%s เขียนทับแฟ้มในแพกเกจ %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "ไม่สามารถอ่าน %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "ไม่สามารถ stat %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "ไม่สามารถลบ %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "ไม่สามารถสร้าง %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "ไม่สามารถ stat %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "ไดเรกทอรี info และ temp ต้องอยู่ในระบบแฟ้มเดียวกัน"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "กำลังอ่านรายชื่อแพกเกจ"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "ไม่สามารถเปลี่ยนไปยังไดเรกทอรีระบบ %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "เกิดข้อผิดพลาดภายในขณะอ่านชื่อแพกเกจ"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "กำลังอ่านรายชื่อแฟ้ม"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1793,486 +1804,492 @@ msgstr ""
 "เปิดแฟ้มรายชื่อแฟ้ม '%sinfo/%s' ไม่สำเร็จ ถ้าคุณไม่สามารถเรียกแฟ้มนี้คืนได้ "
 "ก็ให้สร้างแฟ้มดังกล่าวให้เป็นแฟ้มเปล่า แล้วติดตั้งแพกเกจรุ่นเดิมซ้ำทันที"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "อ่านแฟ้มรายชื่อแฟ้ม %sinfo/%s ไม่สำเร็จ"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "เกิดข้อผิดพลาดภายในขณะอ่านโหนด"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "เปิดแฟ้ม diversion %sdiversions ไม่สำเร็จ"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "แฟ้ม diversion เสียหาย"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "ข้อมูลผิดพลาดในแฟ้ม diversion: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "เกิดข้อผิดพลาดภายในขณะเพิ่ม diversion"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "ต้องกำหนดค่าตั้งต้นแคชของแพกเกจก่อน"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "หาข้อมูลส่วนหัว Package: ไม่พบ ที่ออฟเซ็ต %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "หมวด ConfFile เสียหายในแฟ้ม status ที่ออฟเซ็ต %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "เกิดข้อผิดพลาดขณะแจง MD5 ที่ออฟเซ็ต %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "แฟ้มนี้ไม่ใช่แพกเกจ DEB ที่ใช้การได้ ขาดสมาชิก '%s'"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 "แฟ้มนี้ไม่ใช่แพกเกจ DEB ที่ใช้การได้ ขาดข้อมูล '%s', '%s' หรือ '%s'"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "ไม่สามารถเปลี่ยนไดเรกทอรีไปยัง %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "ข้อผิดพลาดภายใน: ไม่พบสมาชิก %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "ไม่พบแฟ้มควบคุมที่ใช้การได้"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "ไม่สามารถแจงแฟ้มควบคุมได้"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "ไม่สามารถเปิดไปป์สำหรับ %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "เกิดข้อผิดพลาดขณะอ่านจากโพรเซส %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "stat ไม่สำเร็จ"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "ไม่สามารถอ่านฐานข้อมูลซีดีรอม %s"
 
-#: methods/cdrom.cc:208
+#: 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 ""
 "กรุณาใช้ apt-cdrom เพื่อให้ APT รู้จักซีดีรอมนี้ apt-get update ไม่สามารถใช้เพิ่มซีดีรอมใหม่ได้"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "ซีดีรอมผิดแผ่น"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "ไม่สามารถเลิกเมานท์ซีดีรอมใน %s  แผ่นอาจกำลังถูกใช้งานอยู่"
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "ไม่พบแผ่น"
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "ไม่พบแฟ้ม"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI ไม่ถูกต้อง  URI ของแฟ้มในเครื่องต้องขึ้นต้นด้วย //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "เข้าระบบ"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "ไม่สามารถอ่านชื่อของอีกฝ่ายได้"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "ไม่สามารถอ่านชื่อของเครื่องนี้ได้"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "เซิร์ฟเวอร์ปฏิเสธการเชื่อมต่อโดยรายงานว่า: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr "มีการระบุพร็อกซี แต่ไม่มีสคริปต์สำหรับเข้าระบบ ค่า Acquire::ftp:ProxyLogin ว่างเปล่า"
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "คำสั่งสคริปต์เข้าระบบ '%s' ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "หมดเวลารอเชื่อมต่อ"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "เซิร์ฟเวอร์ปิดการเชื่อมต่อ"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "การอ่านข้อมูลผิดพลาด"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "คำตอบท่วมบัฟเฟอร์"
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "มีความเสียหายของโพรโทคอล"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "การเขียนข้อมูลผิดพลาด"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "ไม่สามารถสร้างซ็อกเก็ต"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "ไม่สามารถเชื่อมต่อซ็อกเก็ตข้อมูล เนื่องจากหมดเวลาคอย"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "ไม่สามารถเชื่อมต่อซ็อกเกตแบบ passive"
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo ไม่สามารถนำซ็อกเก็ตที่รอรับการเชื่อมต่อมาใช้"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "ไม่สามารถ bind ซ็อกเก็ต"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "ไม่สามารถ listen ที่ซ็อกเก็ต"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "ไม่สามารถระบุชื่อซ็อกเก็ต"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "ไม่สามารถส่งคำสั่ง PORT"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "ไม่รู้จักตระกูลที่อยู่ %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT ล้มเหลว เซิร์ฟเวอร์ตอบว่า: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "หมดเวลารอเชื่อมต่อซ็อกเก็ตข้อมูล"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "ไม่สามารถรับการเชื่อมต่อ"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "ไม่สามารถดาวน์โหลดแฟ้ม เซิร์ฟเวอร์ตอบว่า: '%s'"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "หมดเวลาคอยที่ซ็อกเก็ตข้อมูล"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "ถ่ายโอนข้อมูลไม่สำเร็จ เซิร์ฟเวอร์ตอบว่า '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "สอบถาม"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "ไม่สามารถเรียก "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "เชื่อมต่อไปยัง %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "ไม่สามารถเริ่มการเชื่อมต่อไปยัง %s:%s (%s)"
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s (%s) เนื่องจากหมดเวลาคอย"
 
-#: methods/connect.cc:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "เชื่อมต่อไปยัง %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "ไม่สามารถเปิดหาที่อยู่ '%s'"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "เกิดข้อผิดพลาดชั่วคราวขณะเปิดหาที่อยู่ '%s'"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "เกิดปัญหาร้ายแรงบางอย่างขณะเปิดหาที่อยู่ '%s:%s' (%i)"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "ไม่สามารถเชื่อมต่อไปยัง %s %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!"
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ"
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "ไม่สามารถเรียก '%s' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "ลายเซ็นต่อไปนี้ไม่สามารถตรวจสอบได้ เพราะไม่มีกุญแจสาธารณะ:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "รอหัวข้อมูล"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "ได้รับบรรทัดข้อมูลส่วนหัวยาวเกิน %u อักขระ"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "บรรทัดข้อมูลส่วนหัวผิดพลาด"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัวตอบมาไม่ถูกต้อง"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Length มาไม่ถูกต้อง"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Range มาไม่ถูกต้อง"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "การสนับสนุน Content-Range ที่เซิร์ฟเวอร์ HTTP ผิดพลาด"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "select ไม่สำเร็จ"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "หมดเวลารอเชื่อมต่อ"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "ไม่สามารถตัดท้ายแฟ้ม"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "ข้อมูลส่วนหัวผิดพลาด"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "เชื่อมต่อไม่สำเร็จ"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "ข้อผิดพลาดภายใน"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "ไม่สามารถ mmap แฟ้มเปล่า"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "ไม่สามารถเปิดไปป์สำหรับ %s"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "ไม่สามารถสร้าง mmap ขนาด %lu ไบต์"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "ไม่สามารถเปิด %s"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "ไม่สามารถเรียก "
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "ไม่สามารถสร้าง mmap ขนาด %lu ไบต์"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "ไม่สามารถตัดท้ายแฟ้ม"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2301,93 +2318,93 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "ไม่พบรายการเลือก %s"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "พบตัวย่อของชนิดที่ข้อมูลไม่รู้จัก: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "ขณะเปิดแฟ้มค่าตั้ง %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: เริ่มบล็อคโดยไม่มีชื่อ"
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: แท็กผิดรูปแบบ"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังค่า"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: สามารถใช้ directive ที่ระดับบนสุดได้เท่านั้น"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: ใช้ include ซ้อนกันมากเกินไป"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: include จากที่นี่"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: พบ directive '%s' ที่ไม่รองรับ"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: สามารถใช้ directive ที่ระดับบนสุดได้เท่านั้น"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังจบแฟ้ม"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... ผิดพลาด!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... เสร็จแล้ว"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "ไม่รู้จักตัวเลือกบรรทัดคำสั่ง '%c' [จาก %s]"
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "ไม่เข้าใจตัวเลือกบรรทัดคำสั่ง %s"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "ตัวเลือกบรรทัดคำสั่ง %s ไม่ได้เป็นค่าบูลีน"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "ตัวเลือก %s ต้องมีอาร์กิวเมนต์"
@@ -2397,343 +2414,361 @@ msgstr "ตัวเลือก %s ต้องมีอาร์กิวเ�
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "ตัวเลือก %s: การกำหนดรายการค่าตั้งต้องมี =<val>"
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "ตัวเลือก %s ต้องการอาร์กิวเมนต์จำนวนเต็ม ไม่ใช่ '%s'"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "ตัวเลือก '%s' ยาวเกินไป"
 
-#: 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 "ไม่เข้าใจค่าบูลีน %s กรุณาลองใช้ true หรือ false"
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "ไม่รู้จักคำสั่ง %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "ไม่สามารถ stat จุดเมานท์ %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "ไม่สามารถเปลี่ยนไดเรกทอรีไปยัง %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "ไม่สามารถ stat ซีดีรอม"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่อ่านได้อย่างเดียว"
 
-#: apt-pkg/contrib/fileutl.cc:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "ไม่สามารถเปิดแฟ้มล็อค %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่เมานท์ผ่าน nfs"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "ไม่สามารถล็อค %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)"
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)"
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "โพรเซสย่อย %s จบการทำงานกระทันหัน"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "ไม่สามารถเปิดแฟ้ม %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "ไม่สามารถเปิดไปป์สำหรับ %s"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "สร้าง IPC ของโพรเซสย่อยไม่สำเร็จ"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "เรียกทำงานตัวบีบอัดไม่สำเร็จ"
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "read: ยังเหลือ %lu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว"
 
-#: apt-pkg/contrib/fileutl.cc:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "write: ยังเหลือ %lu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้"
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "เกิดปัญหาขณะปิดแฟ้ม"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "เกิดปัญหาขณะปิดแฟ้ม"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "เกิดปัญหาขณะ sync แฟ้ม"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "เกิดปัญหาขณะลบแฟ้ม"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "เกิดปัญหาขณะ sync แฟ้ม"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "แคชของแพกเกจว่างเปล่า"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "แฟ้มแคชของแพกเกจเสียหาย"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "แฟ้มแคชของแพกเกจเป็นคนละรุ่นกัน"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "แฟ้มแคชของแพกเกจเสียหาย"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT รุ่นนี้ไม่รองรับระบบนับรุ่นแบบ '%s'"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "แคชของแพกเกจถูกสร้างมาสำหรับสถาปัตยกรรมอื่น"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "ต้องใช้"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "ต้องใช้ขณะติดตั้ง"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "แนะนำ"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "ควรใช้ร่วมกับ"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "ขัดแย้งกับ"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "แทนที่"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "ใช้แทน"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "ทำให้พัง"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "สำคัญ"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "จำเป็น"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "มาตรฐาน"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "ตัวเลือก"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "ส่วนเสริม"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "กำลังสร้างโครงสร้างลำดับความสัมพันธ์"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "รุ่นแพกเกจที่มี"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "สร้างลำดับความสัมพันธ์"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "กำลังอ่านข้อมูลสถานะ"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "ไม่สามารถเปิดแฟ้มสถานะ %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist แบบสัมบูรณ์)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "กำลังเปิด %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป"
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
 
-#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, 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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "ไม่สามารถเปิดแฟ้ม %s"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2745,25 +2780,18 @@ msgstr ""
 "ซึ่งแพกเกจดังกล่าวเป็นแพกเกจที่จำเป็นสำหรับระบบ การลบดังกล่าวมักเป็นอันตราย "
 "แต่ถ้าคุณต้องการทำเช่นนั้นจริงๆ ก็ให้เปิดตัวเลือก APT::Force-LoopBreak"
 
-#: apt-pkg/packagemanager.cc:501
-#, 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
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%s'"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "จำเป็นต้องติดตั้งแพกเกจ %s ซ้ำ แต่หาตัวแพกเกจไม่พบ"
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2771,242 +2799,204 @@ msgstr ""
 "ข้อผิดพลาด: pkgProblemResolver::Resolve สร้างคำตอบที่ทำให้เกิดแพกเกจเสีย "
 "อาจเกิดจากแพกเกจที่ถูกกำหนดให้คงรุ่นไว้"
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้"
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr "ดาวน์โหลดแฟ้มดัชนีบางแฟ้มไม่สำเร็จ จะข้ามรายการดังกล่าวไป หรือใช้ข้อมูลเก่าแทน"
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "ไม่มีไดเรกทอรีรายชื่อแพกเกจ %spartial"
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "ไม่มีไดเรกทอรีแพกเกจ %spartial"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "ไม่สามารถล็อคไดเรกทอรีรายชื่อแพกเกจ"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li (เหลืออีก %s)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "ไม่พบไดรเวอร์สำหรับวิธีการ %s"
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "ไม่สามารถเรียกทำงานวิธีการ %s"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter"
 
-#: apt-pkg/init.cc:147
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "ไม่รองรับระบบแพกเกจ '%s'"
 
-#: apt-pkg/init.cc:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "ไม่สามารถระบุชนิดของระบบแพกเกจที่เหมาะสมได้"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "ไม่สามารถ stat %s"
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน sources.list ของคุณด้วย"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "ไม่สามารถแจงหรือเปิดรายชื่อแพกเกจหรือสถานะแพกเกจได้"
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "คุณอาจเรียก `apt-get update' เพื่อแก้ปัญหาเหล่านี้ได้"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้"
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "ระเบียนผิดรูปแบบในแฟ้มค่าปรับแต่ง: ไม่มีข้อมูลส่วนหัว 'Package'"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "ไม่เข้าใจชนิดการตรึง %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "ไม่ได้ระบุลำดับความสำคัญ (หรือค่าศูนย์) สำหรับการตรึง"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "แคชมีระบบนับรุ่นที่ไม่ตรงกัน"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewVersion1)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนชื่อแพกเกจที่ APT สามารถรองรับได้แล้ว"
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนรุ่นแพกเกจที่ APT สามารถรองรับได้แล้ว"
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนคำบรรยายแพกเกจที่ APT สามารถรองรับได้แล้ว"
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว"
 
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม"
 
-#: apt-pkg/pkgcachegen.cc:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s -> %s)"
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum ไม่ตรงกัน"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "ผลรวมแฮชไม่ตรงกัน"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3014,66 +3004,66 @@ msgid ""
 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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, 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:1698
+#: apt-pkg/acquire-item.cc:1709
 #, 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:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s"
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "ขนาดไม่ตรงกัน"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1)"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "หมายเหตุ: จะเลือก %s แทน %s\n"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "ข้อมูลผิดพลาดในแฟ้ม diversion: %s"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1)"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "บล็อคผู้ผลิต %s ไม่มีลายนิ้วมือ"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3082,41 +3072,41 @@ msgstr ""
 "กำลังใช้จุดเมานท์ซีดีรอม %s\n"
 "กำลังเมานท์ซีดีรอม\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "กำลังตรวจสอบชื่อแผ่น.. "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "ชื่อที่เก็บไว้: %s\n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "กำลังเลิกเมานท์ซีดีรอม...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "กำลังใช้จุดเมานท์ซีดีรอม %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "กำลังเลิกเมานท์ซีดีรอม\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "กำลังรอแผ่น...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "กำลังเมานท์ซีดีรอม...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "กำลังสำรวจข้อมูลในแผ่นเพื่อหาแฟ้มดัชนี..\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3125,22 +3115,22 @@ msgstr ""
 "พบดัชนีแพกเกจ %zu รายการ, ดัชนีซอร์ส %zu รายการ, ดัชนีคำแปล %zu รายการ และลายเซ็น "
 "%zu รายการ\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "พบชื่อแผ่น '%s'\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "ไม่ใช่ชื่อที่ใช้ได้ กรุณาลองใหม่\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3149,295 +3139,368 @@ msgstr ""
 "แผ่นนี้เรียกชื่อว่า:\n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "กำลังคัดลอกรายชื่อแพกเกจ..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "กำลังเขียนรายชื่อแหล่งแพกเกจแหล่งใหม่\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "บรรทัดรายชื่อแหล่งแพกเกจสำหรับแผ่นนี้คือ:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "เขียนแล้ว %i ระเบียน\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มผิดขนาด %i แฟ้ม\n"
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "ขณะเปิดแฟ้มค่าตั้ง %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "ผลรวมแฮชไม่ตรงกัน"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "จะล้มเลิกการติดตั้ง"
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "ไม่พบรุ่น '%s' ของ '%s'"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "ไม่พบงาน %s"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "ไม่พบแพกเกจ %s"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "กำลังติดตั้ง %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "กำลังตั้งค่า %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "กำลังถอดถอน %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "กำลังเรียกการสะกิด %s หลังการติดตั้ง"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "ไม่มีไดเรกทอรี '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "ไม่สามารถเปิดแฟ้ม %s"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "กำลังเตรียม %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "กำลังแตกแพกเกจ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "กำลังเตรียมตั้งค่า %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "ติดตั้ง %s แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "กำลังเตรียมถอดถอน %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "ถอดถอน %s แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "ไม่สามารถเขียนบันทึกปฏิบัติการ เนื่องจาก openpty() ล้มเหลว (ไม่ได้เมานท์ /dev/pts "
 "หรือเปล่า?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, 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:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "ไม่สามารถเปิดแฟ้ม %s"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "การเชื่อมต่อถูกปิดก่อนเวลาอันควร"
 
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "ตัวคลายบีบอัด"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "read: ยังเหลือ %lu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "write: ยังเหลือ %lu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewVersion1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "ข้อผิดพลาดภายใน: ไม่พบสมาชิก"
 
diff --git a/po/tl.po b/po/tl.po
index 5d5b37c7b..62431cb14 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -20,153 +20,154 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paketeng %s bersyon %s ay may kulang na dep:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Kabuuan ng mga Pakete : "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Kabuuan ng mga Pakete : "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Normal na Pakete: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Purong Birtwual na Pakete: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Nag-iisang Birtwal na Pakete: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Halong Birtwal na Pakete: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Kulang/Nawawala: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Kabuuan ng Natatanging mga Bersyon: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Kabuuan ng Natatanging mga Bersyon: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Kabuuan ng mga Dependensiya: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Kabuuan ng ugnayang Ber/Talaksan: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Kabuuan ng ugnayang Ber/Talaksan: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Kabuuan ng Mapping ng Provides: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Kabuuan ng Globbed String: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Kabuuan ng gamit na puwang ng Dependensiyang Bersyon: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Kabuuan ng Hindi Nagamit na puwang: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Kabuuan ng puwang na napag-tuosan: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Wala sa sync ang talaksan ng paketeng %s."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Walang nahanap na mga pakete"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Kailangan niyong magbigay ng isa lamang na pattern"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Talaksang Pakete:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Mga naka-Pin na Pakete:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(hindi nahanap)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Nakaluklok: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Kandidato: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(wala)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Naka-Pin na Pakete: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Talaang Bersyon:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -242,29 +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:77
+#: cmdline/apt-cdrom.cc:79
 #, 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:92
+#: cmdline/apt-cdrom.cc:94
 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:127
+#: cmdline/apt-cdrom.cc:129
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 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."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Mga argumento ay hindi naka-pares"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -292,12 +293,12 @@ msgstr ""
 "  -c=? Basahin itong talaksang pagkaayos\n"
 "  -o=? Itakda ang isang option sa pagkaayos, hal. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s ay hindi balido na paketeng DEB."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -321,40 +322,40 @@ 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:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Hindi makapagsulat sa %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Hindi makuha ang bersyon ng debconf. Nakaluklok ba ang debconf?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Mahaba masyado ang talaan ng extensyon ng mga pakete"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Error sa pagproseso ng directory %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Mahaba masyado ang talaan ng extensyon ng pagkukunan (source)"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Error sa pagsulat ng panimula sa talaksang nilalaman (contents)"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Error sa pagproseso ng Contents %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -439,26 +440,26 @@ msgstr ""
 "  -c=?  Basahin itong talaksang pagkaayos\n"
 "  -o=?  Itakda ang isang option na pagkaayos"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Walang mga pinili na tugma"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "May mga talaksang kulang sa grupo ng talaksang pakete `%s'"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "Nasira ang DB, pinalitan ng pangalan ang talaksan sa %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "Luma ang DB, sinusubukang maupgrade ang %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 #, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
@@ -467,111 +468,111 @@ msgstr ""
 "Hindi tanggap ang anyo ng DB. Kung kayo ay nagsariwa mula sa nakaraang "
 "bersiyon ng apt, tanggalin at likhain muli ang database."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Hindi mabuksan ang talaksang DB %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Bigo ang pag-stat ng %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Walang kontrol rekord ang arkibo"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Hindi makakuha ng cursor"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Hindi mabasa ang directory %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Hindi ma-stat %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: Mga error ay tumutukoy sa talaksang "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Bigo sa pag-resolba ng %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Bigo ang paglakad sa puno"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Bigo ang pagbukas ng %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Bigo ang pagbasa ng link %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Bigo ang pag-unlink ng %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Bigo ang pag-link ng %s sa %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink limit na %sB tinamaan.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Walang field ng pakete ang arkibo"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s ay walang override entry\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  Tagapangalaga ng %s ay %s hindi %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s ay walang override entry para sa pinagmulan\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s ay wala ring override entry na binary\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Bigo ang pagreserba ng memory"
 
@@ -581,18 +582,18 @@ msgid "Unable to open %s"
 msgstr "Hindi mabuksan %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Maling anyo ng override %s linya %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Maling anyo ng override %s linya %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Maling anyo ng override %s linya %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -600,63 +601,51 @@ msgstr "Maling anyo ng override %s linya %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "Bigo ang pagbasa ng talaksang override %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Hindi kilalang algorithmong compression '%s'"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Kailangan ng compression set ang compressed output %s"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Bigo sa paglikha ng IPC pipe sa subprocess"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Bigo ang paglikha ng FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Bigo ang pag-fork"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Anak para sa pag-Compress"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Error na internal, bigo ang paglikha ng %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Bigo ang paglikha ng subprocess IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Bigo ang pag-exec ng taga-compress"
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "taga-decompress"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "Bigo ang IO sa subprocess/talaksan"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Bigo ang pagbasa habang tinutuos ang MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Problema sa pag-unlink ng %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
@@ -665,75 +654,79 @@ msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
 msgid "Y"
 msgstr "O"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Error sa pag-compile ng regex - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "ngunit ang %s ay nakaluklok"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ngunit ang %s ay iluluklok"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "ngunit hindi ito maaaring iluklok"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "ngunit ito ay birtwal na pakete"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "ngunit ito ay hindi nakaluklok"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "ngunit ito ay hindi iluluklok"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " o"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Ang susunod na mga pakete ay iu-upgrade:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (dahil sa %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -741,60 +734,60 @@ msgstr ""
 "BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n"
 "HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu iniluklok muli, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nai-downgrade, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Ang paketeng %s ay paketeng birtwal na bigay ng:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Nakaluklok]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 #, fuzzy
 msgid " [Not candidate version]"
 msgstr "Bersyong Kandidato"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Dapat kayong mamili ng isa na iluluklok."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -805,132 +798,132 @@ msgstr ""
 "Maaaring nawawala ang pakete, ito'y laos na, o ito'y makukuha lamang\n"
 "sa ibang pinagmulan.\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Gayunpaman, ang sumusunod na mga pakete ay humahalili sa kanya:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Paunawa, pinili ang %s imbes na %s\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ay pinakabagong bersyon na.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ngunit ang %s ay iluluklok"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Inaayos ang mga dependensiya..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " ay bigo."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Hindi maayos ang mga dependensiya"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Hindi mai-minimize ang upgrade set"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Tapos"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Maaari ninyong patakbuhin ang 'apt-get -f install' upang ayusin ito."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 "BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr ""
 "Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Iluklok ang mga paketeng ito na walang beripikasyon [o/H]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "May mga problema at -y ay ginamit na walang --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Nakapagtataka.. Hindi magkatugma ang laki, mag-email sa apt@packages.debian."
@@ -938,21 +931,21 @@ 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Kailangang kumuha ng %sB/%sB ng arkibo.\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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Kailangang kumuha ng %sB ng arkibo.\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:1154
+#: cmdline/apt-get.cc:1168
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -960,31 +953,31 @@ 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:1159
+#: cmdline/apt-get.cc:1173
 #, fuzzy, c-format
 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:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Hindi matantsa ang libreng puwang sa %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Kulang kayo ng libreng puwang sa %s."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Oo, gawin ang sinasabi ko!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -995,28 +988,28 @@ msgstr ""
 "Upang magpatuloy, ibigay ang pariralang '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Abort."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Nais niyo bang magpatuloy [O/h]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Bigo sa pagkuha ng %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "May mga talaksang hindi nakuha"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1024,19 +1017,19 @@ msgstr ""
 "Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o "
 "subukang may --fix-missing?"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Hindi maayos ang mga kulang na pakete."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Ina-abort ang pag-instol."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1046,35 +1039,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1090,17 +1083,17 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error na internal, may nasira ang problem resolver"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1110,7 +1103,7 @@ msgid_plural ""
 msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1118,20 +1111,20 @@ msgid_plural ""
 msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "Maaaring patakbuhin niyo ang 'apt-get -f install' upang ayusin ang mga ito:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1139,7 +1132,7 @@ msgstr ""
 "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
 "mga pakete (o magtakda ng solusyon)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1150,80 +1143,80 @@ 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:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Sirang mga pakete"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Mga paketeng mungkahi:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Mga paketeng rekomendado:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "ngunit ang %s ay iluluklok"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Sinusuri ang pag-upgrade... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Bigo"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Tapos"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Error na internal, may nasira ang problem resolver"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Hindi maaldaba ang directory ng download"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 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:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Hindi mahanap ang paketeng source para sa %s"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1231,85 +1224,85 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Kunin ang Source %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Bigo sa pagkuha ng ilang mga arkibo."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, 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:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Utos na build '%s' ay bigo.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Bigo ang prosesong anak"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 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:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, 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:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Walang build depends ang %s.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1318,7 +1311,7 @@ msgstr ""
 "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
 "mahanap"
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1327,14 +1320,14 @@ msgstr ""
 "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
 "mahanap"
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1343,7 +1336,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:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1352,30 +1345,30 @@ msgstr ""
 "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
 "mahanap"
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, 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:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Hindi mabuo ang build-dependencies para sa %s."
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Bigo sa pagproseso ng build dependencies"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Kumokonekta sa %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Suportadong mga Module:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1460,7 +1453,7 @@ msgstr ""
 "para sa karagdagang impormasyon at mga option.\n"
 "                       Ang APT na ito ay may Kapangyarihan Super Kalabaw.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1468,33 +1461,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Tumama "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Kunin: "
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "DiPansin "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Err "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Nakakuha ng %sB ng %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [May ginagawa]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1505,46 +1498,62 @@ msgstr ""
 " '%s'\n"
 "sa drive '%s' at pindutin ang enter\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "ngunit ito ay hindi nakaluklok"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "ngunit ang %s ay iluluklok"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "ngunit ang %s ay iluluklok"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s ay pinakabagong bersyon na.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s ay pinakabagong bersyon na.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "ngunit ang %s ay iluluklok"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Bigo ang pagbukas ng %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1566,11 +1575,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Di kilalang record ng pakete!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1634,196 +1643,198 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Pinagsasama ang magagamit na impormasyon"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Bigo sa paglikha ng mga pipe"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Bigo sa pagtakbo ng gzip "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Sirang arkibo"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Bigo ang checksum ng tar, sira ang arkibo"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Hindi tanggap na signature ng arkibo"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Error sa pagbasa ng header ng miyembro ng arkibo"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, fuzzy, c-format
 msgid "Invalid archive member header %s"
 msgstr "Hindi tanggap na header ng miyembro ng arkibo"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Hindi tanggap na header ng miyembro ng arkibo"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Bitin ang arkibo. Sobrang iksi."
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Bigo ang pagbasa ng header ng arkibo"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "Tinawagan ang DropNode sa naka-link pa na node"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Bigo sa paghanap ng elemento ng hash!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Bigo ang pagreserba ng diversion"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Internal error sa AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Sinusubukang patungan ang diversion, %s -> %s at %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Dobleng pagdagdag ng diversion %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Nadobleng talaksang conf %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Bigo sa pagsulat ng talaksang %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Bigo sa pagsara ng talaksang %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Sobrang haba ang path na %s"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Binubuklat ang %s ng labis sa isang beses"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Ang directory %s ay divertado"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Sobrang haba ng path na diversion"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "Bigo ang paghanap ng node sa kanyang hash bucket"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Sobrang haba ng path"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, 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:429
+#: apt-inst/extract.cc:432
 #, 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"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Hindi mabasa ang %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Hindi ma-stat ang %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Bigo sa pagtanggal ng %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Hindi malikha ang %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Bigo sa pag-stat ng %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Ang info at temp directory ay kailangang nasa parehong filesystem"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Binabasa ang Listahan ng mga Pakete"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Bigo sa paglipat sa admin dir %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Internal error sa pagkuha ng pangalan ng pakete"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Binabasa ang Talaksang Listahan"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1834,114 +1845,115 @@ msgstr ""
 "ang talaksang ito, gawin itong walang laman at muling instolahin kaagad ang "
 "parehong bersyon ng pakete!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Bigo sa pagbasa ng talaksang listahan %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Internal error sa pagkuha ng Node"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Bigo sa pagbukas ng talaksang diversions %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "Ang talaksang diversion ay sira"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Di tanggap na linya sa talaksang diversion: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Internal error sa pagdagdag ng diversion"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "Ang cache ng pkg ay dapat ma-initialize muna"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Bigo sa paghanap ng Pakete: Header, offset %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Maling ConfFile section sa talaksang status. Offset %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Error sa pag-parse ng MD5. Offset %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s'"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 apt-inst/deb/debfile.cc:55
 #, fuzzy, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 msgstr ""
 "Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s' o '%s'"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Hindi makalipat sa %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Internal error, hindi mahanap ang miyembrong %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Bigo sa paghanap ng tanggap na talaksang control"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Di maintindihang talaksang control"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Hindi makapag-bukas ng pipe para sa %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Error sa pagbasa mula sa prosesong %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Bigo ang pag-stat"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Bigo ang pagtakda ng oras ng pagbago"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Hindi mabasa ang database ng cdrom %s"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1949,56 +1961,56 @@ msgstr ""
 "Paki-gamit ang apt-cdrom upang makilala ng APT itong CD na ito. Hindi "
 "maaaring gamitin ang apt-get update upang magdagdag ng bagong mga CD"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "Maling CD"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Hindi mai-unmount ang CD-ROM sa %s, maaaring ginagamit pa ito."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Hindi nahanap ang Disk."
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Hindi Nahanap ang Talaksan"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Di tanggap na URI, mga lokal na URI ay di dapat mag-umpisa ng //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Pumapasok"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Hindi malaman ang pangalan ng peer"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Hindi malaman ang pangalang lokal"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Inayawan ng server ang ating koneksyon at ang sabi ay: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Bigo ang USER/GUMAGAMIT, sabi ng server ay: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Bigo ang PASS, sabi ng server ay: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2006,200 +2018,200 @@ msgstr ""
 "May tinakdang katuwang na server ngunit walang login script, walang laman "
 "ang Acquire::ftp::ProxyLogin."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Bigo ang utos sa login script '%s', sabi ng server ay: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Bigo ang TYPE, sabi ng server ay: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Lumipas ang koneksyon"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Sinarhan ng server ang koneksyon"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Error sa pagbasa"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "May sagot na bumubo sa buffer."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Sira ang protocol"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Error sa pagsulat"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Hindi maka-likha ng socket"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "Hindi maka-konekta sa socket ng datos, nag-time-out ang koneksyon"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Hindi maka-konekta sa socket na passive."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "di makakuha ang getaddrinfo ng socket na nakikinig"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Hindi maka-bind ng socket"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Hindi makarinig sa socket"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Hindi malaman ang pangalan ng socket"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Hindi makapagpadala ng utos na PORT"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Di kilalang pamilya ng address %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Bigo ang EPRT, sabi ng server ay: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Nag-timeout ang socket ng datos"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Hindi makatanggap ng koneksyon"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Problema sa pag-hash ng talaksan"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Hindi makakuha ng talaksan, sabi ng server ay '%s'"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Nag-timeout ang socket ng datos"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Bigo ang paglipat ng datos, sabi ng server ay '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Tanong"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Hindi ma-invoke "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Kumokonekta sa %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Hindi maumpisahan ang koneksyon sa %s:%s (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Kumokonekta sa %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Hindi maresolba ang '%s'"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Pansamantalang kabiguan sa pagresolba ng '%s'"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, 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:243
+#: methods/connect.cc:247
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Hindi maka-konekta sa %s %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 #, 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:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Hindi kilalang error sa pag-execute ng gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Ang sumusunod na mga lagda ay imbalido:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2207,123 +2219,128 @@ msgstr ""
 "Ang sumusunod na mga lagda ay hindi maberipika dahil ang public key ay hindi "
 "available:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Naghihintay ng panimula"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Nakatanggap ng isang linyang panimula mula %u na mga karakter"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Maling linyang panimula"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Nagpadala ang HTTP server ng di tanggap na reply header"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Sira ang range support ng HTTP server na ito"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Di kilalang anyo ng petsa"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Bigo ang pagpili"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Nag-timeout ang koneksyon"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Error sa pagsulat ng talaksang output"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Error sa pagsulat sa talaksan"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Error sa pagsusulat sa talaksan"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Error sa pagbasa mula sa server"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "Bigo sa pagsulat ng talaksang %s"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Maling datos sa panimula"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Bigo ang koneksyon"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Internal na error"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Hindi mai-mmap ang talaksang walang laman"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Hindi makapag-bukas ng pipe para sa %s"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Hindi makagawa ng mmap ng %lu na byte"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "Hindi mabuksan %s"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "Hindi ma-invoke "
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Hindi makagawa ng mmap ng %lu na byte"
+
+#: apt-pkg/contrib/mmap.cc:311
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Bigo sa pagsulat ng talaksang %s"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2352,95 +2369,95 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Piniling %s ay hindi nahanap"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Hindi kilalang katagang uri: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Binubuksan ang talaksang pagsasaayos %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntax error %s:%u: Nag-umpisa ang block na walang pangalan."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntax error %s:%u: Maling anyo ng Tag"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntax error %s:%u: May basura matapos ng halaga"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Syntax error %s:%u: Maaari lamang gawin ang mga direktiba sa tuktok na antas"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntax error %s:%u: Labis ang pagkaka-nest ng mga include"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntax error %s:%u: Sinama mula dito"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Syntax error %s:%u: Maaari lamang gawin ang mga direktiba sa tuktok na antas"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntax error %s:%u: May basura sa dulo ng talaksan"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Error!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Tapos"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Opsyon sa command line '%c' [mula %s] ay di kilala."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Opsyon sa command line %s ay di naintindihan."
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Opsyon sa command line %s ay hindi boolean"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Opsyon %s ay nangangailangan ng argumento"
@@ -2452,347 +2469,365 @@ msgstr ""
 "Opsyon %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng "
 "=<halaga>."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Opsyon %s ay nangangailangan ng argumentong integer, hindi '%s'"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Opsyon '%s' ay labis ang haba"
 
-#: 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 "Hindi naintindihan ang %s, subukan ang true o false."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Di tanggap na operasyon %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Di mai-stat ang mount point %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Di makalipat sa %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Bigo sa pag-stat ng cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Hindi mabuksan ang talaksang aldaba %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "hindi makuha ang aldaba %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Naghintay, para sa %s ngunit wala nito doon"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, 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:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Ang sub-process %s ay lumabas ng di inaasahan"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Hindi mabuksan ang talaksang %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Hindi makapag-bukas ng pipe para sa %s"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Bigo ang paglikha ng subprocess IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Bigo ang pag-exec ng taga-compress"
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, 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:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, 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:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problema sa pagsara ng talaksan"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Problema sa pagsara ng talaksan"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problema sa pag-sync ng talaksan"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problema sa pag-unlink ng talaksan"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Problema sa pag-sync ng talaksan"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Walang laman ang cache ng pakete"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Sira ang talaksan ng cache ng pakete"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "Ang talaksan ng cache ng pakete ay hindi magamit na bersyon"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Sira ang talaksan ng cache ng pakete"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Ang APT na ito ay hindi nagsusuporta ng versioning system '%s'"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 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:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Dependensiya"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "PreDepends"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Mungkahi"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Rekomendado"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Tunggali"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Pumapalit"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Linalaos"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "importante"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "kailangan"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "standard"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "optional"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Ginagawa ang puno ng mga dependensiya"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Bersyong Kandidato"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Pagbuo ng Dependensiya"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 #, fuzzy
 msgid "Reading state information"
 msgstr "Pinagsasama ang magagamit na impormasyon"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Bigo ang pagbukas ng %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Bigo sa pagsulat ng talaksang %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Hindi ma-parse ang talaksang pakete %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Binubuksan %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, 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:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, 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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Hindi mabuksan ang talaksang %s"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2804,19 +2839,12 @@ msgstr ""
 "loop. Madalas ay masama ito, ngunit kung nais niyo talagang gawin ito, i-"
 "activate ang APT::Force-LoopBreak na option."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Hindi suportado ang uri ng talaksang index na '%s'"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2824,7 +2852,7 @@ msgstr ""
 "Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo "
 "para dito."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2832,12 +2860,12 @@ msgstr ""
 "Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot "
 "ito ng mga paketeng naka-hold."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 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:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2846,239 +2874,201 @@ msgstr ""
 "May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang "
 "mga luma na lamang."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Nawawala ang directory ng talaan %spartial."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Nawawala ang directory ng arkibo %spartial."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "Hindi maaldaba ang directory ng talaan"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Kinukuha ang talaksang %li ng %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Ang driver ng paraang %s ay hindi mahanap."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Hindi umandar ng tama ang paraang %s"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: 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:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete "
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Hindi ma-stat ang %s"
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 "Hindi ma-parse o mabuksan ang talaan ng mga pakete o ng talaksang estado."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Maaaring patakbuhin niyo ang apt-get update upang ayusin ang mga problemang "
 "ito"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Hindi naintindihan ang uri ng pin %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Walang prioridad (o sero) na nakatakda para sa pin"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Hindi akma ang versioning system ng cache"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "May naganap na error habang prinoseso ang %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "May naganap na error habang prinoseso ang %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "May naganap na error habang prinoseso ang %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "May naganap na error habang prinoseso ang %s (NewVersion1)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "May naganap na error habang prinoseso ang %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "May naganap na error habang prinoseso ang %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Wow, nalagpasan niyo ang bilang ng pangalan ng pakete na kaya ng APT na ito."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 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:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "May naganap na error habang prinoseso ang %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "May naganap na Error habang prinoseso ang %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, 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:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, 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:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Kinukuha ang Talaksang Provides"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "IO Error sa pag-imbak ng source cache"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "Di tugmang MD5Sum"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Di tugmang MD5Sum"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3086,12 +3076,12 @@ msgid ""
 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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3100,7 +3090,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:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3109,7 +3099,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:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3117,41 +3107,41 @@ msgstr ""
 "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
 "paketeng %s."
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Di tugmang laki"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Paunawa, pinili ang %s imbes na %s\n"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, 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:125
+#: apt-pkg/indexrecords.cc:137
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Block ng nagbebenta %s ay walang fingerprint"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3160,42 +3150,42 @@ msgstr ""
 "Ginagamit ang %s bilang mount point ng CD-ROM\n"
 "Sinasalang ang CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Kinikilala..."
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Naka-imbak na Label: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "Ina-unmount ang CD-ROM..."
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Ginagamit ang %s bilang mount point ng CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Ina-unmount ang CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Hinihintay ang disc...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Sinasalang ang CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Sinisiyasat ang Disc para sa talaksang index...\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, fuzzy, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3204,22 +3194,22 @@ msgstr ""
 "Nakahanap ng %i na index ng mga pakete, %i na index ng source at %i na "
 "signature\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
 msgstr "Naka-imbak na Label: %s \n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Hindi yan tanggap na pangalan, subukan muli.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3228,295 +3218,370 @@ msgstr ""
 "Ang Disc na ito ay nagngangalang: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Kinokopya ang Listahan ng mga Pakete"
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Sinusulat ang bagong listahan ng pagkukunan\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 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:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Nagsulat ng %i na record.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, 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:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Nagsulat ng %i na record na may %i na talaksang kulang at %i na talaksang "
 "mismatch\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Binubuksan ang talaksang pagsasaayos %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Di tugmang MD5Sum"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Ina-abort ang pag-instol."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release '%s' para sa '%s' ay hindi nahanap"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "Iniluklok ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Isasaayos ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Tinatanggal ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Natanggal ng lubusan ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Nawawala ang directory ng talaan %spartial."
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Hindi mabuksan ang talaksang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Hinahanda ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Binubuklat ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Hinahanda ang %s upang isaayos"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "Iniluklok ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Naghahanda para sa pagtanggal ng %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "Tinanggal ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Naghahanda upang tanggalin ng lubusan ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "Natanggal ng lubusan ang %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Hindi maaldaba ang directory ng talaan"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Hindi mabuksan ang talaksang %s"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Nagsara ng maaga ang koneksyon"
 
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Maling anyo ng override %s linya %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Maling anyo ng override %s linya %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Maling anyo ng override %s linya %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "taga-decompress"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (UsePackage1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (NewVersion1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (UsePackage3)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "May naganap na Error habang prinoseso ang %s (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Internal error, hindi mahanap ang miyembro"
 
diff --git a/po/uk.po b/po/uk.po
index 96dd4cc5b..dbf78ce31 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt-all\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+0200\n"
 "PO-Revision-Date: 2006-07-29 15:57+0300\n"
 "Last-Translator: Artem Bondarenko <artem.brz@gmail.com>\n"
 "Language-Team: Українська <uk@li.org>\n"
@@ -16,153 +16,154 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Пакунок %s версії %s має незадоволену залежність:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Всього імен пакунків : "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Всього імен пакунків : "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Нормальних пакунків: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Чисто віртуальних пакунків: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Окремих віртуальних пакунків: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr " Змішаних віртуальних пакунків: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Пропущено: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Всього унікальних версій: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Всього унікальних версій: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Всього залежностей: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Всього відносин Версія/Файл: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Всього відносин Версія/Файл: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Всього відносин Provides: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Всього розгорнутих рядків: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Всього інформації про залежності: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Порожнього місця в кеші: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Загальний простір полічений для: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Перелік пакунків %s розсинхронізований."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Не знайдено жодного пакунка"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Ви повинні задати рівно один шаблон"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Не можу знайти пакунок %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Переліки пакунків:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Кеш не синхронізований, неможливо знайти посилання на перелік пакунків"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Зафіксовані пакунки:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(не знайдено)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Встановлено: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Кандидат: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(відсутній)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Фіксатор(pin) пакунка: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Таблиця версій:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -235,29 +236,29 @@ msgstr ""
 "tmp\n"
 "Подробиці в сторінках керівництва apt-cache(8) і apt.conf(5).\n"
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 #, 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:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Вставте диск у пристрій і натисніть Ввід"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Не вдалося перейменувати %s в %s"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Повторіть цей процес для інших наявних CD."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Непарні аргументи"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -285,12 +286,12 @@ msgstr ""
 "   -с=? Читати зазначений конфігураційний файл.\n"
 "   -o=? Встановити довільну опцію, наприклад, -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s не є правильним DEB-пакунком."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -314,42 +315,42 @@ msgstr ""
 "  -c=? Читати зазначений конфігураційний файл\n"
 "  -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Неможливо записати в %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Неможливо визначити версію debconf. Він встановлений?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Список розширень, припустимих для пакунків, занадто довгий"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr ""
 "Список розширень, припустимих для пакунків з вихідними текстами, занадто "
 "довгий"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Помилка запису заголовка в повний перелік вмісту пакунків (Contents)"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "помилка обробки повного переліку вмісту пакунків (Contents) %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -437,26 +438,26 @@ msgstr ""
 "  -c=?  Використати зазначений конфігураційний файл\n"
 "  -o=?  Вказати довільний параметр конфігурації"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Збігів не виявлено"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "У групі пакунків '%s' відсутні деякі файли"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "БД була пошкоджена, файл перейменований в %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB застаріла, намагаюсь оновити %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 #, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
@@ -465,111 +466,111 @@ msgstr ""
 "Формати DB не є правильним. Якщо ви оновилися зі старої версії apt, будь-"
 "ласка видаліть і наново створіть базу."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Не вдалося відкрити DB файл %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Не вдалося одержати атрибути %s"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "В архіві немає поля control"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Неможливо одержати курсор"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Не вдалося прочитати теку %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: Неможливо прочитати атрибути %s\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: Помилки відносяться до файлу"
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Не вдалося піти по посиланню %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Не вдалося зробити обхід дерева"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Не вдалося відкрити %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr "DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Не вдалося прочитати посилання %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Не вдалося видалити %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Не вдалося створити посилання %s на %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr "Перевищено ліміт в %s в DeLink.\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "В архіві немає поля package"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr " Відсутній запис про перепризначення для %s\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: 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:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - не вдалося виділити пам'ять"
 
@@ -579,18 +580,18 @@ msgid "Unable to open %s"
 msgstr "Не вдалося відкрити %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -598,63 +599,51 @@ msgstr "Спотворений запис про перепризначення
 msgid "Failed to read the override file %s"
 msgstr "Не вдалося прочитати файл перепризначень (override)%s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Невідомий алгоритм стиснення '%s'"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Для отримання стиснутого виводу %s необхідно ввімкнути пакування"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Не вдалося створити IPC-канал для породженого процесу"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Не вдалося створити FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Не вдалося виконати породжений процес"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Процес-нащадок, що виконує пакування"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Внутрішня помилка, не вдалося створити %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Не вдалося створити IPC з породженим процесом"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Не вдалося виконати компресор "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "декомпресор"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "Помилка уведення/виводу в підпроцес/файл"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Помилка читання під час обчислення MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Не вдалося видалити %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Не вдалося перейменувати %s в %s"
@@ -663,75 +652,79 @@ msgstr "Не вдалося перейменувати %s в %s"
 msgid "Y"
 msgstr "Т"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Помилка компіляції регулярного виразу - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Пакунки, що мають незадоволені залежності:"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "але %s вже встановлений"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "але %s буде встановлений"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "але він не може бути встановлений"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "але це віртуальний пакунок"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "але він не встановлений"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "але він не буде встановлений"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " чи"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "НОВІ пакунки, які будуть встановлені:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Пакунки, які будуть ВИДАЛЕНІ:"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Пакунки, які будуть залишені в незмінному вигляді:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Пакунки, які будуть ОНОВЛЕНІ:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Пакунки, будуть замінені на більш СТАРІ версії:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Пакунки, які повинні були б залишитися без змін, але будуть замінені:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (внаслідок %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -739,60 +732,60 @@ msgstr ""
 "УВАГА: Ці істотно важливі пакунки будуть вилучені.\n"
 "НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "оновлено %lu, встановлено %lu нових пакунків, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr " %lu перевстановлено, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu пакунків замінено на старі версії, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "для видалення відмічено %lu пакунків, і %lu пакунків не оновлено.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "не встановлено до кінця чи видалено %lu пакунків.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Помітьте, регулярний вираз %2$s призводить до вибору %1$s\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Помітьте, регулярний вираз %2$s призводить до вибору %1$s\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Пакунок %s - віртуальний, його функції надаються пакунками:\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Встановлено]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 #, fuzzy
 msgid " [Not candidate version]"
 msgstr "Версії кандидатів"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Ви повинні явно вказати, який саме ви хочете встановити."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -804,188 +797,188 @@ msgstr ""
 "Це може означати, що пакунок відсутній, застарів, або доступний з джерел, не "
 "згаданих в sources.list\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Однак наступні пакунки можуть його замінити:"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Для пакунка %s не знайдені кандидати на встановлення"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Помітьте, замість %2$s вибирається %1$s\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Пропускається %s - пакунок вже встановлений, і опція upgrade не "
 "встановлена.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Пропускається %s - пакунок вже встановлений, і опція upgrade не "
 "встановлена.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Перевстановлення %s неможливе, бо він не може бути завантаженим.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "Вже встановлена найновіша версія %s.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "але %s буде встановлений"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Обрана версія %s (%s) для %s\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Обрана версія %s (%s) для %s\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Пакунок %s не встановлений, тому не може бути видалений\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Виправлення залежностей..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " невдача."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Неможливо скоригувати залежності"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Неможливо мінімізувати набір оновлень"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Виконано"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 "Можливо, для виправлення цих помилок ви захочете скористатися 'apt-get -f "
 "install'."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Незадоволені залежності. Спробуйте використати -f."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Автентифікаційне попередження не прийнято до уваги.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Встановити ці пакунки без перевірки [т/Н]? "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Деякі пакунки неможливо автентифікувати"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Існують проблеми, а опція -y використана без --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "Внутрішня помилка, InstallPackages була викликана з непрацездатними "
 "пакунками!"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Пакунки необхідно видалити, але видалення заборонене."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Внутрішня помилка, Ordering не завершилася"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "Дивно.. Розбіжність розмірів, напишіть на apt@packages.debian.org"
 
 #. 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:1142
+#: cmdline/apt-get.cc:1156
 #, 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:1147
+#: cmdline/apt-get.cc:1161
 #, 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:1154
+#: cmdline/apt-get.cc:1168
 #, 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:1159
+#: cmdline/apt-get.cc:1173
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 "Після розпакування об'єм зайнятого дискового простору зменшиться на %sB.\n"
 
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Не вдалося визначити кількість вільного місця в %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Недостатньо вільного місця в %s."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "Запитане виконання тільки тривіальних операцій, але це не тривіальна "
 "операція."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Так, робити, як я скажу!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -996,28 +989,28 @@ msgstr ""
 "Щоб продовжити, введіть фразу: '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Перервано."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Бажаєте продовжити [Т/н]? "
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Не вдалося завантажити %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Деякі файли не вдалося завантажити"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Вказано режим \"тільки завантаження\", і завантаження завершено"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1025,19 +1018,19 @@ msgstr ""
 "Неможливо завантажити деякі архіви, імовірно треба виконати apt-get update "
 "або спробувати повторити запуск з ключем --fix-missing?"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing і зміна носія в даний момент не підтримується"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Неможливо виправити втрачені пакунки."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Переривається встановлення."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1047,35 +1040,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Не вдалося прочитати атрибути переліку вихідних текстів%s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Команді update не потрібні аргументи"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1093,16 +1086,16 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "Наступна інформація можливо допоможе Вам:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Внутрішня помилка, вирішувач проблем все поламав"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1112,7 +1105,7 @@ msgid_plural ""
 msgstr[0] "НОВІ пакунки були встановлені автоматично і більше не потрібні:"
 msgstr[1] "НОВІ пакунки були встановлені автоматично і більше не потрібні:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1120,21 +1113,21 @@ msgid_plural ""
 msgstr[0] "НОВІ пакунки були встановлені автоматично і більше не потрібні:"
 msgstr[1] "НОВІ пакунки були встановлені автоматично і більше не потрібні:"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Використовуйте 'apt-get autoremove' щоб видалити їх."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Внутрішня помилка, AllUpgrade все поламав"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f "
 "install':"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1142,7 +1135,7 @@ msgstr ""
 "Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не "
 "вказуючи імені пакунка (або знайдіть інше рішення)."
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1153,82 +1146,82 @@ msgstr ""
 "або ж використаєте нестабільний дистрибутив, і запитані Вами пакунки\n"
 "ще не створені або були вилучені з Incoming."
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Зламані пакунки"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Будуть встановлені наступні додаткові пакунки:"
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Пропоновані пакунки:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Рекомендовані пакунки:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Не можу знайти пакунок %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "але %s буде встановлений"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Обчислення оновлень... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Невдача"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Виконано"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Внутрішня помилка, вирішувач проблем все поламав"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Неможливо заблокувати теку для завантаження"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
 "тексти"
 
-#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Неможливо знайти пакунок з вихідними текстами для %s"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1236,89 +1229,89 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускаємо вже завантажений файл '%s'\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Завантаження вихідних текстів %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Деякі архіви не вдалося завантажити."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Розпакування вихідних текстів пропущено, тому що в %s вже перебувають "
 "розпаковані вихідні тексти\n"
 
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Команда розпакування '%s' завершилася невдало.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
 
-#: cmdline/apt-get.cc:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Команда побудови '%s' закінчилася невдало.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Породжений процес завершився невдало"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Для перевірки залежностей для побудови необхідно вказати як мінімум один "
 "пакунок"
 
-#: cmdline/apt-get.cc:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Неможливо одержати інформацію про залежності для побудови %s"
 
-#: cmdline/apt-get.cc:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s не має залежностей для побудови.\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1326,7 +1319,7 @@ msgid ""
 msgstr ""
 "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено"
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2924
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1334,14 +1327,14 @@ msgid ""
 msgstr ""
 "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено"
 
-#: cmdline/apt-get.cc:2912
+#: cmdline/apt-get.cc:2947
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Не вдалося задовольнити залежність типу %s для пакунка %s: Встановлений "
 "пакунок %s новіше, аніж треба"
 
-#: cmdline/apt-get.cc:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1350,7 +1343,7 @@ msgstr ""
 "Залежність типу %s для %s не може бути задоволена, бо ні одна з версій "
 "пакунка %s не задовольняє умови"
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1358,30 +1351,30 @@ msgid ""
 msgstr ""
 "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено"
 
-#: cmdline/apt-get.cc:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s"
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Залежності для побудови %s не можуть бути задоволені."
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "Обробка залежностей для побудови закінчилася невдало"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "З'єднання з %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Підтримувані модулі:"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1470,7 +1463,7 @@ msgstr ""
 "містять більше інформації.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1478,33 +1471,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "В кеші "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Отр:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ігн "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Пом "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Отримано %sB за %sB (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Йде робота]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1513,46 +1506,62 @@ msgid ""
 msgstr ""
 "Зміна носія: вставте диск з міткою '%s' у пристрій '%s' і натисніть Ввід\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "але він не встановлений"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "але %s буде встановлений"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "але %s буде встановлений"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "Вже встановлена найновіша версія %s.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "Вже встановлена найновіша версія %s.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "але %s буде встановлений"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Не вдалося відкрити %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1574,11 +1583,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Запис про невідомий пакунок!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1642,200 +1651,202 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Об'єднання інформації про доступні пакунки"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Не вдалося створити канали (pipes)"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Не вдалося виконати компресор gzip"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Пошкоджений архів"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Контрольна сума tar архіва невірна, архів пошкоджений"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Невідомий тип заголовку TAR %u, член %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Невірний підпис архіву"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Неможливо прочитати заголовок \"member\" архіву"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, fuzzy, c-format
 msgid "Invalid archive member header %s"
 msgstr "Невірний заголовок \"member\" архіву"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Невірний заголовок \"member\" архіву"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Архів занадто малий"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Не вдалося прочитати заголовки архіву"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 #, fuzzy
 msgid "DropNode called on still linked node"
 msgstr "DropNode викликаний для вузла, який ще використовується"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Не вдалося знайти елемент хешу!"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 #, fuzzy
 msgid "Failed to allocate diversion"
 msgstr "Не вдалося створити diversion"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Внутрішня помилка в AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, fuzzy, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Спроба зміни diversion, %s -> %s і %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, fuzzy, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Подвійне додавання diversion %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Копія конфігураційного файлу %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Не вдалося записати файл %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Не вдалося закрити файл %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Шлях %s занадто довгий"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Розпакування %s більш ніж один раз"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, fuzzy, c-format
 msgid "The directory %s is diverted"
 msgstr "Тека %s входить до переліку diverted"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, fuzzy, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Пакет пробує писати у diversion %s/%s"
 
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 #, fuzzy
 msgid "The diversion path is too long"
 msgstr "Шлях diversion занадто довгий"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "Тека %s замінюється не текою"
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
 #, fuzzy
 msgid "Failed to locate node in its hash bucket"
 msgstr "Не вдалося розмістити вузол у хеші"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Шлях занадто довгий"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, fuzzy, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Файли заміняються вмістом пакета %s без версії"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, fuzzy, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Файл %s/%s перезаписує інший з пакету %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Неможливо прочитати %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Неможливо прочитати атрибути %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Невдача видалення %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Неможливо створити %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Не вдалося прочитати атрибути %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Теки info і temp повинні бути на тій самій файловій системі"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Читання переліків пакетів"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Невдача зміни до адмінової теки %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Внутрішня помилка отримання назви пакунку"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Читання переліку файлів"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1846,116 +1857,117 @@ msgstr ""
 "файл, тоді зробіть його пустим і негайно реінсталюйте ту ж саму версію "
 "пакунка!"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Невдача читання list файла %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 #, fuzzy
 msgid "Internal error getting a node"
 msgstr "Внутрішня помилка при отриманні Node"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, fuzzy, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Не вдалося відкрити файл diversions %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 #, fuzzy
 msgid "The diversion file is corrupted"
 msgstr "Файл diversions пошкоджений"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, fuzzy, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Невірна лінія в файлі diversions: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 #, fuzzy
 msgid "Internal error adding a diversion"
 msgstr "Внутрішня помилка при додаванні diversion"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "Кеш пакунків повинен бути ініціалізованим першим"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, fuzzy, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Не вдалося знайти пакунок: заголовок, зсув %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, fuzzy, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Погана секція ConfFile у статусному файлі. Зсув %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, fuzzy, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Помилка обробки MD5. Зсув %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Невірний DEB архів, відсутній член '%s'"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 apt-inst/deb/debfile.cc:55
 #, fuzzy, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 msgstr "Невірний DEB архів, відсутній член '%s' чи '%s'"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Неможливо змінити %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Внутрішня помилка, не можу знайти складову частину %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Не вдалося знайти правильний контрольний (control) файл"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Контрольний файл не можливо обробити"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Неможливо відкрити канал (pipe) для %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Помилка читання з процесу %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Не вдалося одержати атрибути"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Не вдалося встановити час модифікації"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Неможливо прочитати базу %s з cdrom'у"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1963,56 +1975,56 @@ msgstr ""
 "Будь-ласка використовуйте apt-cdrom, щоб APT розпізнав цей CD-ROM, apt-get "
 "update не може бути використаним для додання нових CD"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "Невірний CD-ROM"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Неможливо демонтувати CDROM в %s, можливо він все ще використовується."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Диск не знайдено."
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Файл не знайдено"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Невірне посилання, локальні посилання повинні починатися з //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Логінюсь в"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Неможливо визначити назву вузла"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Неможливо визначити локальну назву"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Сервер розірвав з'єднання і мовив: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER невдало, сервер мовив: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS невдало, сервер мовив: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2020,201 +2032,201 @@ msgstr ""
 "Вказано проксі-сервер, але відсутній скрипт логіну, Acquire::ftp::ProxyLogin "
 "пустий."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Команда '%s'скрипту логіна не вдалася, сервер мовив: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE невдало, сервер мовив: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Час з'єднання вичерпався"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Сервер закрив з'єднання"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Помилка читання"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Відповідь переповнила буфер."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Спотворений протокол"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Помилка запису"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Неможливо створити сокет (socket)"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "Неможливо під'єднати сокет (socket) з даними, час з'єднання вичерпався"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Неможливо під'єднати пасивний сокет (passive socket)."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 #, fuzzy
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Виклик getaddrinfo не зміг отримати сокет"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Неможливо приєднатися до сокета"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 #, fuzzy
 msgid "Could not listen on the socket"
 msgstr "Не можливо утримувати з'єднання на сокеті"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Не вдалося визначити назву сокета"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Неможливо відіслати команду PORT"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Невідоме адресове сімейство %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT невдало, сервер мовив: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Час з'єднання з сокетом даних вичерпався"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Неможливо прийняти з'єднання"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Проблема хешування файла"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Неможливо завантажити файл, сервер мовив: '%s'"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Час з'єднання з сокетом (socket) з даними вичерпався"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Передача даних обірвалася, сервер мовив '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Черга"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Неможливо викликати "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "З'єднання з %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Неможливо ініціалізувати з'єднання з %s:%s (%s)."
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Неможливо з'єднатися з %s:%s (%s), час з'єднання вичерпався"
 
-#: methods/connect.cc:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "З'єднання з %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Не можу знайти IP адрес для %s"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Тимчасова помилка при отриманні IP адреси '%s'"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i)"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Не можливо під'єднатися до %s %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його "
 "відбиток?!"
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "Знайдено як мінімум один невірний підпис."
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "Неможливо виконати '%s' для перевірки підпису, gpgv встановлено?"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Невідома помилка виконання gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "Слідуючі підписи були невірними:\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -2222,125 +2234,130 @@ msgstr ""
 "Слідуючі підписи не можуть бути перевірені, тому що, публічний ключ "
 "відсутній:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Очікування на заголовки"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Отримано одну заголовкову лінію понад %u символів"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Невірна лінія заголовку"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP сервер відіслав невірний заголовок 'reply'"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Цей HTTP сервер має поламану підтримку 'range'"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Невідомий формат дати"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Вибір не вдався"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Час очікування з'єднання вийшов"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Помилка запису в вихідний файл"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 #, fuzzy
 msgid "Error writing to file"
 msgstr "Помилка запису в файл"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 #, fuzzy
 msgid "Error writing to the file"
 msgstr "Помилка запису в файл"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Помилка читання з сервера. Віддалена сторона закрила з'єднання"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Помилка читання з сервера"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "Не вдалося записати файл %s"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Погана заголовкова інформація"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "З'єднання не вдалося"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Внутрішня помилка"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Неможливо відобразити в пам'яті пустий файл"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Неможливо відкрити канал (pipe) для %s"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Неможливо відобразити в пам'яті %lu байт"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "Не вдалося відкрити %s"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "Неможливо викликати "
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Неможливо відобразити в пам'яті %lu байт"
+
+#: apt-pkg/contrib/mmap.cc:311
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Не вдалося записати файл %s"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2369,97 +2386,97 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Вибір %s не знайдено"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Нерозпізнаваний тип абревіатури: '%c'"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Відкривається конфігураційний файл %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Синтаксова помилка  %s:%u: Блок починається без назви."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Синтаксова помилка %s:%u: спотворений тег"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Синтаксова помилка %s:%u: зайві символи після величини"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 "Синтаксова помилка  %s:%u: Директиви можуть бути виконані тільки на "
 "найвищому рівні"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Синтаксова помилка  %s:%u: Забагато вмонтованих включень"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Синтаксова помилка %s:%u: Включена звідси"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Синтаксова помилка  %s:%u: Директива '%s' не підтримується"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Синтаксова помилка  %s:%u: Директиви можуть бути виконані тільки на "
 "найвищому рівні"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Синтаксова помилка %s:%u: зайві символи в кінці файла"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Помилка!"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Виконано"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Невідомий параметр '%c' [з %s] командного рядка."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Незрозумілий параметр %s командного рядка"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Не логічний параметр %s командного рядка"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Параметр %s потребує аргумента."
@@ -2469,351 +2486,369 @@ msgstr "Параметр %s потребує аргумента."
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Параметр %s потребує цілочислений аргумент, але не  '%s'"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Параметр '%s' занадто довгий"
 
-#: 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 "Незрозумілий вираз %s , спробуйте true чи false."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Невірна дія %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Неможливо прочитати атрибути точки монтування %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Неможливо зробити зміни у %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Не вдалося прочитати атрибути cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Блокування не використовується, так як файл блокування %s доступний тільки "
 "для читання"
 
-#: apt-pkg/contrib/fileutl.cc:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Не можливо відкрити lock файл %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 "Блокування не використовується, так як файл блокування %s знаходиться на "
 "файловій системі nfs"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, fuzzy, c-format
 msgid "Could not get lock %s"
 msgstr "Не можливо отримати lock %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Очікується на %s але його тут немає"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Підпроцес %s отримав segmentation fault."
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Підпроцес %s отримав segmentation fault."
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Підпроцес %s повернув код помилки (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Підпроцес %s раптово завершився"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Не можливо відкрити файл %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Неможливо відкрити канал (pipe) для %s"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "Не вдалося створити IPC з породженим процесом"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "Не вдалося виконати компресор "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr ""
 "помилка при читанні. мали прочитати ще %lu байт, але нічого більше нема"
 
-#: apt-pkg/contrib/fileutl.cc:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "помилка при записі, мали прочитати ще %lu байт, але не змогли"
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Проблема з закриттям файла"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Проблема з закриттям файла"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Проблема з синхронізацією файла"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Проблема з роз'єднанням файла"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Проблема з синхронізацією файла"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Кеш пакунків пустий"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Файл кешу пакунків пошкоджений"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "Файл кешу пакунків має несумісну версію"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Файл кешу пакунків пошкоджений"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT не підтримує систему призначення версій '%s'"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "Кеш пакунків був побудований для іншої архітектури"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Залежності (Depends)"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Пре-Залежності (PreDepends)"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Пропонує (Suggests)"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Рекомендує"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Конфлікти"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Заміняє (Replaces)"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Застарілі (Obsoletes)"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "Важливі (Important)"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "Необхідні (Required)"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "Стандартні (Standard)"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "Необов'язкові (Optional)"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "Додаткові (Extra)"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Побудова дерева залежностей"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Версії кандидатів"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Ґенерація залежностей"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 #, fuzzy
 msgid "Reading state information"
 msgstr "Об'єднання інформації про доступні пакунки"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Не вдалося відкрити %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Не вдалося записати файл %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Неможливо обробити файл %s пакунку (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Неможливо обробити файл %s пакунку (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "Спотворена лінія %lu у переліку джерел %s (dist parse)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 "Спотворена лінія %lu у переліку джерел %s (проблема в назві дистрибутиву)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Спотворена лінія %lu у переліку джерел %s (dist parse)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Спотворена лінія %lu у переліку джерел %s (dist parse)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "Спотворена лінія %lu у переліку джерел %s (dist parse)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Спотворена лінія %lu у переліку джерел %s (проблема в URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 "Спотворена лінія %lu у переліку джерел %s (проблема в назві дистрибутиву)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Спотворена лінія %lu у переліку джерел %s (обробка URI)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Спотворена лінія %lu у переліку джерел %s (absolute dist)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Спотворена лінія %lu у переліку джерел %s (dist parse)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Відкриття %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Лінія %u занадто довга в переліку джерел %s."
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Спотворена лінія %u у переліку джерел %s (тип)"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Невідомий тип '%s' в лінії %u в переліку джерел %s"
 
-#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, 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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Не можливо відкрити файл %s"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2825,19 +2860,12 @@ msgstr ""
 "погано, але якщо Ви дійсно бажаєте зробити це, активуйте параметр APT::Force-"
 "LoopBreak."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Тип '%s' індексного файлу не підтримується"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2845,7 +2873,7 @@ msgstr ""
 "Пакунок %s повинен бути перевстановленим, але я не можу знайти архіву для "
 "нього."
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2853,11 +2881,11 @@ msgstr ""
 "Помилка, pkgProblemResolver::Resolve згенерував зупинку, це може бути "
 "пов'язано з зафіксованими пакунками."
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Неможливо усунути проблеми, Ви маєте поламані зафіксовані пакунки."
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2866,236 +2894,198 @@ msgstr ""
 "Деякі індексні файли не завантажилися, вони були зігноровані або замість них "
 "були використані старі версії."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Lists тека %spartial відсутня."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Архівна тека %spartial відсутня."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "Неможливо заблокувати теку з переліками пакунків"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, fuzzy, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Завантажується файл %li з %li (%s залишилось)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, fuzzy, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Завантажується файл %li з %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Драйвер для метода %s не знайдено."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Метод %s не стартував коректно"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Будь-ласка, вставте диск з поміткою: '%s' в CD привід '%s' і натисніть Enter."
 
-#: apt-pkg/init.cc:147
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Система пакування '%s' не підтримується"
 
-#: apt-pkg/init.cc:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Неможливо визначити тип необхідної системи пакування "
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Неможливо прочитати атрибути %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Ви повинні записати певні 'source' посилання в твій sources.list"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Не можу обробити чи відкрити перелік пакунків чи status файл."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Можливо, для виправлення цих помилок Ви захочете запустити apt-get"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Неможливо прочитати перелік джерел."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Невірний запис в preferences файлі, відсутній заголовок Package"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Не зрозумів тип %s для pin"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Не встановлено пріоритету (або встановлено 0) для pin"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Кеш має несумісну систему призначення версій"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (NewVersion1)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Помилка, яка була викликана внаслідок обробки %s (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Ви перевищили кількість імен пакунків, які APT може обробити."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Ви перевищили кількість версій, які APT може обробити."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 #, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Ви перевищили кількість версій, які APT може обробити."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Ви перевищили кількість залежностей які APT може обробити."
 
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Помилка, яка була викликана внаслідок обробки %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Пакунок %s %s не був знайдений під час обробки залежностей файла"
 
-#: apt-pkg/pkgcachegen.cc:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Не вдалося прочитати атрибути переліку вихідних текстів%s"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 #, fuzzy
 msgid "Collecting File Provides"
 msgstr "Збирання інформації про  файлів "
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "Помилка IO під час збереження джерельного кешу"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "Не вдалося перейменувати, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "Невідповідність MD5Sum"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Невідповідність MD5Sum"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 #, fuzzy
 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:1488
 #, 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:1510
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3103,12 +3093,12 @@ msgid ""
 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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3117,7 +3107,7 @@ msgstr ""
 "Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч "
 "виправити цей пакунок. (due to missing arch)"
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3126,48 +3116,48 @@ msgstr ""
 "Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч "
 "виправити цей пакунок."
 
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Індексні файли пакунків пошкоджені. Немає поля Filename для пакунку %s."
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Невідповідність розміру"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Неможливо обробити файл %s пакунку (1)"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Помітьте, замість %2$s вибирається %1$s\n"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Невірна лінія в файлі diversions: %s"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Неможливо обробити файл %s пакунку (1)"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Блок постачальника %s не містить відбитку (fingerprint)"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3176,64 +3166,64 @@ msgstr ""
 "Використовується точка монтування CDROM: %s\n"
 "Монтування CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Ідентифікація.. "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Записано мітку: %s \n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "Демонтується CD-ROM..."
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Використовується точка монтування CDROM: %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Демонтується CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Чекаю на диск...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Монтується CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Диск сканується на індексні файли..\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, fuzzy, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr "Знайдено %i індексів пакунків, %i індексів джерел і %i підписів\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
 msgstr "Записано мітку: %s \n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Не є вірною назвою, спробуйте ще.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3242,294 +3232,371 @@ msgstr ""
 "Цей диск зветься: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Копіюються переліки пакунків..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Записується новий перелік джерел\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "Перелік джерел для цього диску:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Записано %i записів.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Записано %i записів з %i відсутніми файлами.\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Записано %i записів з %i невідповідними файлам\n"
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Записано %i записів з %i відсутніми і %i невідповідними файлами\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Відкривається конфігураційний файл %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Невідповідність MD5Sum"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Переривається встановлення."
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Реліз '%s' для '%s' не знайдений"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Версія '%s' для '%s' не знайдена"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Не можу знайти пакунок %s"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Не можу знайти пакунок %s"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "Встановлено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Конфігурація %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Видаляється %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Повністю видалено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Lists тека %spartial відсутня."
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Не можливо відкрити файл %s"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Підготовка %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Розпакування %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Підготовка до конфігурації %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "Встановлено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Підготовка до видалення %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "Видалено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Підготовка до повного видалення %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "Повністю видалено %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Неможливо записати в лог, проблема з openpty() (не змонтовано /dev/pts?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, 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:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Не можливо відкрити файл %s"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "З'єднання завершено передчасно"
 
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "декомпресор"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr ""
+#~ "помилка при читанні. мали прочитати ще %lu байт, але нічого більше нема"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "помилка при записі, мали прочитати ще %lu байт, але не змогли"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Помилка, яка була викликана внаслідок обробки %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Помилка, яка була викликана внаслідок обробки %s (NewVersion1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage3)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Помилка, яка була викликана внаслідок обробки %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr ""
+#~ "Помилка, яка була викликана внаслідок обробки %s (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Внутрішня помилка, не можу знайти member"
 
diff --git a/po/vi.po b/po/vi.po
index 8dcef7fc5..ffd8f588e 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+0200\n"
 "PO-Revision-Date: 2010-09-29 21:36+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -17,150 +17,151 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Gói %s phiên bản %s phụ thuộc vào phần mềm chưa có :\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Tổng các tên gói: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Tổng các cấu trúc gói: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Gói chuẩn: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Gói ảo nguyên chất: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Gói ảo đơn: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Gói ảo hỗn hợp: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Thiếu : "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Tổng phiên bản riêng: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Tổng mô tả riêng: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Tổng đồ phụ thuộc: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Tổng liên quan phiên bản và tập tin: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Tổng liên quan mô tả/tập tin: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Tổng ảnh xạ Miễn là: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Tổng chuỗi mở rộng mẫu tìm kiếm: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Tổng chỗ phiên bản phụ thuộc: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Tổng chỗ nghỉ: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Tổng chỗ đã tính: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Tập tin gói %s không đồng bộ được."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Không tìm thấy gói"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 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:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Không thể định vị gói %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Tập tin gói:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Các gói đã ghim:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(không tìm thấy)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Đã cài đặt: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Ứng cử: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(không có)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Ghim gói: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Bảng phiên bản:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s cho %s được biên dịch trên %s %s\n"
 
-#: cmdline/apt-cache.cc:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -241,28 +242,28 @@ msgstr ""
 "Để tìm thông tin thêm, xem hai trang « man » (hướng dẫn)\n"
 "\t\t\tapt-cache(8) và apt.conf(5).\n"
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 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:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Lỗi lắp « %s » trên « %s »"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 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."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Không có các đối số dạng cặp"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -292,12 +293,12 @@ msgstr ""
 "  -c=? \t\tĐọc tập tin cấu hình này\n"
 "  -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s không phải là một gói DEB hợp lệ."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -325,40 +326,40 @@ msgstr ""
 "  -c=? \t\tĐọc tập tin cấu hình này\n"
 "  -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Không thể ghi vào %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Danh sách mở rộng gói quá dài"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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 "Gặp lỗi khi xử lý thư mục %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Danh sách mở rộng nguồn quá dài"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Gặp lỗi khi xử lý nội dung %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -454,26 +455,26 @@ msgstr ""
 "  -c=? \t\tĐọc tập tin cấu hình này\n"
 "  -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Không có điều đã chọn khớp được"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Thiếu một số tập tin trong nhóm tập tin gói « %s »."
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tâp tin thành %s.old (old: cũ)."
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "Cơ sở dữ liệu cũ nên đang cố nâng cấp lên %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -481,111 +482,111 @@ msgstr ""
 "Định dạng co sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản "
 "apt cũ, hãy gỡ bỏ nó và sau đó tạo lại co sở dữ liệu."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 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:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
-#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Việc lấy thông tin toàn bộ cho %s bị lỗi"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Kho không có mục ghi điều khiển"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Không thể lấy con chạy"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "CB: Không thể đọc thư mục %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, 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:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "LỖI: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "CB: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "LỖI: có lỗi áp dụng vào tập tin "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Việc quyết định %s bị lỗi"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Việc di chuyển qua cây bị lỗi"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "Việc mở %s bị lỗi"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " Bỏ liên kết %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, 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:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Việc bỏ liên kết %s bị lỗi"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, 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:294
+#: ftparchive/writer.cc:296
 #, 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:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Kho không có trường gói"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s không có mục ghi đè\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  người bảo quản %s là %s không phải %s\n"
 
-#: ftparchive/writer.cc:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s không có mục ghi đè nguồn\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, 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"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi"
 
@@ -595,18 +596,18 @@ msgid "Unable to open %s"
 msgstr "Không thể mở %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "Điều đè dạng sai %s dòng %lu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "Điều đè dạng sai %s dòng %lu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "Điều đè dạng sai %s dòng %lu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -614,63 +615,51 @@ msgstr "Điều đè dạng sai %s dòng %lu #3"
 msgid "Failed to read the override file %s"
 msgstr "Việc đọc tập tin đè %s bị lỗi"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Không biết thuật toán nén « %s »"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Dữ liệu xuất đã nén %s cần một bộ nén"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Việc tạo ống IPC đến tiến trình con bị lỗi"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Việc tạo TẬP_TIN* bị lỗi"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Việc tạo tiến trình con bị lỗi"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Nén điều con"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Lỗi nội bộ, việc tạo %s bị lỗi"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Việc tạo tiến trình con IPC bị lỗi"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Việc thực hiện bô nén bị lỗi "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "bộ giải nén"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "việc nhập/xuất vào tiến trình con/tập tin bị lỗi"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Việc đọc khi tính MD5 bị lỗi"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Gặp lỗi khi bỏ liên kết %s"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Việc đổi tên %s thành %s bị lỗi"
@@ -679,75 +668,79 @@ msgstr "Việc đổi tên %s thành %s bị lỗi"
 msgid "Y"
 msgstr "C"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Lỗi biên dich biểu thức chính quy - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "Những gói theo đây phụ thuộc vào phần mềm chưa có :"
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "nhưng mà %s đã được cài đặt"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "nhưng mà %s sẽ được cài đặt"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "nhưng mà nó không có khả năng cài đặt"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "nhưng mà nó là gói ảo"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "nhưng mà nó chưa được cài đặt"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "nhưng mà nó sẽ không được cài đặt"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " hay"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "Theo đây có những gói MỚI sẽ được cài đặt:"
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "Theo đây có những gói sẽ bị GỠ BỎ :"
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "Theo đây có những gói đã được giữ lại:"
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "Theo đây có những gói sẽ được nâng cấp:"
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Theo đây có những gói sẽ được HẠ CẤP:"
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "Theo đây có những gói sẽ được thay đổi:"
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (do %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -755,59 +748,59 @@ msgstr ""
 "CẢNH BÁO : theo đây có những gói chủ yếu sẽ bị gỡ bỏ.\n"
 "ĐỪNG làm như thế trừ khi bạn biết làm gì ở đây nó một cách chính xác."
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu đã nâng cấp, %lu mới được cài đặt, "
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu được cài đặt lại, "
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu được hạ cấp, "
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu cần gỡ bỏ, và %lu chưa được nâng cấp.\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Ghi chú : đang chọn « %s » cho tác vụ « %s »\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Ghi chú : đang chọn « %s » cho biểu thức chính quy « %s »\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Gói %s là gói ảo được cung cấp do :\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Đã cài đặt]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr " [Không phải phiên bản ứng cử]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Bạn nên chọn một cách dứt khoát gói cần cài."
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -818,182 +811,182 @@ msgstr ""
 "đã tham chiếu đến nó. Có lẽ có nghĩa là gói còn thiếu,\n"
 "đã trở thành cũ, hay chỉ sẵn sàng từ nguồn khác.\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Tuy nhiên, những gói theo đây thay thế nó :"
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Gói « %s » không có ứng cử cài đặt"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "Không thể gỡ bỏ được gói ảo như « %s »\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Ghi chú : đang chọn « %s » thay cho « %s »\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chưa lập tùy chọn Nâng cấp.\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Đang bỏ qua %s vì nó không phải được cài đặt và chỉ yêu cầu Nâng cấp.\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Không thể cài đặt lại %s vì không thể tải về nó.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s là phiên bản mơi nhất.\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s được đặt thành « được cài đặt bằng tay ».\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Đã chọn phiên bản « %s » (%s) cho « %s »\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "Đã chọn phiên bản « %s » (%s) cho « %s »\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Đang sửa chữa quan hệ phụ thuộc..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " bị lỗi."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Không thể sửa cách phụ thuộc"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Không thể cực tiểu hóa tập hợp nâng cấp"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Hoàn tất"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Có lẽ bạn hãy chay lệnh « apt-get -f install » để sửa hết."
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr ""
 "Còn có cách phụ thuộc vào phần mềm chưa có. Như thế thì bạn hãy cố dùng tùy "
 "chọn « -f »."
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "CẢNH BÁO : không thể xác thực những gói theo đây."
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Cảnh báo xác thực bị đè.\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Cài đặt những gói này mà không kiểm chứng không? [y/N] [c/K] "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Một số gói không thể được xác thực"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Gập lỗi và đã dùng tùy chọn « -y » mà không có  « --force-yes »"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Lỗi nội bộ: InstallPackages (cài đặt gói) được gọi với gói bị hỏng."
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ (Remove) đã bị tắt."
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Lạ... Hai kích cỡ không khớp được. Hãy gởi thư cho <apt@packages.debian.org>"
 
 #. 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:1142
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Cần phải lấy %sB/%sB kho.\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:1147
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Cần phải lấy %sB kho.\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:1154
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được chiếm.\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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được giải phóng.\n"
 
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Không thể quyết định chỗ rảnh trong %s"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Bạn chưa có đủ sức chức còn rảnh trong %s."
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "Xác đinh « Chỉ không đáng kể » (Trivial Only) nhưng mà thao tác này đáng kể."
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Có, làm đi."
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1004,28 +997,28 @@ msgstr ""
 "Để tiếp tục thì gõ cụm từ « %s »\n"
 "?]"
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Hủy bỏ."
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 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:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Việc lấy %s bị lỗi  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Một số tập tin không tải về được"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Mới tải về xong và trong chế độ chỉ tải về"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1033,21 +1026,21 @@ msgstr ""
 "Không thể lấy một số kho, có lẽ hãy chạy lệnh « apt-get update » (apt lấy "
 "cập nhật) hay cố với « --fix-missing » (sửa các điều còn thiếu) không?"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "Chưa hô trợ tùy chọn « --fix-missing » (sửa khi thiếu điều) và trao đổi "
 "phương tiện."
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Không thể sửa những gói còn thiếu."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Đang hủy bỏ tiến trình cài đặt."
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1058,35 +1051,35 @@ msgstr[0] ""
 "Những gói theo đây không còn nằm trên hệ thống này vì mọi tập tin đều bị gói "
 "khác ghi đè:"
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "Ghi chú : thay đổi này được tự động làm bởi dpkg."
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Bỏ qua bản phát hành đích không sẵn sàng « %s » của gói « %s »"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Đang chọn « %s » làm gói nguồn, thay cho « %s »\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Bỏ qua phiên bản không sẵn sàng « %s » của gói « %s »"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Lệnh cập nhật không chấp nhận đối số"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỏ Tự động"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1104,15 +1097,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 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:"
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Lỗi nội bộ : Bộ Gỡ bỏ Tự động đã làm hư gì."
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1121,26 +1114,26 @@ msgid_plural ""
 msgstr[0] ""
 "Gói nào theo đây đã được tự động cài đặt nên không còn cần thiết lại:"
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, 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 gói đã được tự động cài đặt nên không còn cần thiết lại.\n"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Hãy sử dụng lệnh « apt-get autoremove » để gỡ bỏ chúng."
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:"
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1148,7 +1141,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:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1160,73 +1153,73 @@ 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:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Gói bị hỏng"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 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:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Gói đề nghị:"
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Gói khuyến khích:"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Không tìm thấy gói %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s được lập thành « được tự động cài đặt ».\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Đang tính bước nâng cấp... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "Bị lỗi"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Hoàn tất"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 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:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Không thể khoá thư mục tải về"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 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:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, 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:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1236,7 +1229,7 @@ msgstr ""
 "bản « %s » tại:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1247,106 +1240,106 @@ msgstr ""
 "bzr get %s\n"
 "để lấy các bản cập nhật gói mới nhất (có thể là chưa phát hành).\n"
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, 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:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Cần phải lấy %sB kho nguồn.\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Lấy nguồn %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Việc lấy một số kho bị lỗi."
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, 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:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Lệnh giải nén « %s » bị lỗi.\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, 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:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Lệnh xây dụng « %s » bị lỗi.\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Tiến trình con bị lỗi"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 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:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, 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:2738
+#: cmdline/apt-get.cc:2773
 #, 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:2868
+#: cmdline/apt-get.cc:2903
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 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:2889
+#: cmdline/apt-get.cc:2924
 #, 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:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1355,37 +1348,37 @@ msgstr ""
 "cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng "
 "của gói %s có thể thỏa điều kiện phiên bản."
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 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:2980
+#: cmdline/apt-get.cc:3015
 #, 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:2996
+#: cmdline/apt-get.cc:3031
 #, 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:3001
+#: cmdline/apt-get.cc:3036
 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:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Đang kết nối đến %s (%s)..."
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "Mô-đun đã hỗ trợ :"
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1481,7 +1474,7 @@ msgstr ""
 "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:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1493,33 +1486,33 @@ msgstr ""
 "      Cũng ghi nhớ rằng chức năng khoá bị tắt,\n"
 "      thì không nên thấy đây là trường hợp hiện thời thật."
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Lần tìm "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Lấy:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Bỏq "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Lỗi "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Mới lấy %sB trong %s (%sB/g).\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Hoạt động]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1530,46 +1523,62 @@ msgstr ""
 " « %s »\n"
 "vào ổ « %s » và bấm nút Enter\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "nhưng mà nó chưa được cài đặt"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s được đặt thành « được cài đặt bằng tay ».\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s được lập thành « được tự động cài đặt ».\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s là phiên bản mơi nhất.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s là phiên bản mơi nhất.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s được đặt thành « được cài đặt bằng tay ».\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Việc mở %s bị lỗi"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1591,11 +1600,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Không rõ mục ghi gói."
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1657,198 +1666,200 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Đang hợp nhất các thông tin sẵn sàng..."
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "Việc tạo những ống bị lỗi"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "Việc thực hiện gzip bị lỗi "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Kho bị hỏng."
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Lỗi kiểm tổng tar, kho bị hỏng"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, 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"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "Chữ ký kho không hợp lệ"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "Gặp lỗi khi đọc phần đầu bộ phạn kho"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "Phần đầu bộ phận kho lưu không hợp lệ %s"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "Phần đầu bộ phạn kho không hợp lê"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "Kho quá ngắn"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "Việc đọc phần đầu kho bị lỗi"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn liên kết"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "Việc định vi phần tử băm bị lỗi"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "Việc cấp phát sự trệch đi bị lỗi"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Đang cố ghi đè một sự trệch đi, %s → %s và %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Sự trệch đi được thêm hai lần %s → %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Tập tin cấu hình trùng %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Việc ghi tập tin %s bị lỗi"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Việc đóng tập tin %s bị lỗi"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "Đường dẫn %s quá dài"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Đang giải nén %s nhiều lần"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Thư mục %s bị trệch hướng"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, 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:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Đường dẫn trệch đi quá dài."
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, 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:280
+#: apt-inst/extract.cc:283
 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:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "Đường dẫn quá dài"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, 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:429
+#: apt-inst/extract.cc:432
 #, 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"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "Không thể đọc %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Không thể lấy các thông tin về %s"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Việc gỡ bỏ %s bị lỗi"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Không thể tạo %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Việc lấy các thông tin về %sinfo bị lỗi"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "Những thư mục info (thông tin) và temp (tạm thời) cần phải trong cùng một hệ "
 "thống tập tin"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "Đang đọc các danh sách gói..."
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Việc chuyển đổi sang thư mục quản lý %sinfo bị lỗi"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "Gặp lỗi nội bộ khi lấy tên gói"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Đang đọc danh sách tập tin..."
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1858,116 +1869,117 @@ msgstr ""
 "Việc mở tập tin danh sách « %sinfo/%s » bị lỗi. Nếu bạn không thể phục hồi "
 "tập tin này, bạn hãy làm cho nó rỗng và ngay cài đặt lại cùng phiên bản gói."
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Việc đọc tập tin danh sách %sinfo/%s bị lỗi"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "Gặp lỗi nội bộ khi lấy nút điểm..."
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Việc mở tập tin trệch đi %sdiversions bị lỗi"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
 msgstr "Tập tin trệch đi bị hỏng"
 
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Gặp dòng không hợp lệ trong tập tin trệch đi: %s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "Gặp lỗi nội bộ khi thêm một sự trệch đi"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "Phải khởi động bộ nhớ tạm gói trước hết"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Lỗi tìm thấy Gói: phần đầu, hiệu số %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr ""
 "Có phần cấu hình tập tin (ConfFile) sai trong tập tin trạng thái. Hiệu số %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Gặp lỗi khi phân tách MD5. Hiệu số %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Đây không phải là môt kho DEB hợp lệ vì còn thiếu bộ phạn « %s »"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 ""
 "Đây không phải là môt kho DEB hợp lệ vì không có bộ phạn « %s », « %s » hay "
 "« %s »"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Không thể chuyển đổi sang %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Gặp lỗi nội bộ, không thể định vị bộ phạn %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "Việc định vị tập tin điều khiển hợp lệ bị lỗi"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "Tập tin điều khiển không có khả năng phân tách"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Không thể mở ống dẫn cho %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "Gặp lỗi đọc từ tiến trình %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "Việc lấy các thông tin bị lỗi"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "Việc lập giờ sửa đổi bị lỗi"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Không thể đọc cơ sở dữ liệu đĩa CD-ROM %s"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1975,56 +1987,56 @@ msgstr ""
 "Hãy sử dụng lệnh « apt-cdrom » để làm cho APT chấp nhận đĩa CD này. Không "
 "thể sử dụng lệnh « apt-get update » (lấy cập nhật) để thêm đĩa CD mới."
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "CD không đúng"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Không thể tháo gắn kết đĩa CD-ROM trong %s. Có lẽ nó còn dùng."
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "Không tìm thấy đĩa"
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "Không tìm thấy tập tin"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "Địa chỉ URI không hợp lệ: URI không thể bắt đầu với « // »"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Đang đăng nhập"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Không thể quyết định tên ngang hàng"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Không thể quyết định tên cục bộ"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Máy phục vụ đã từ chối kết nối, và nói: %s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Lệnh USER (người dùng) đã thất bại: máy phục vụ nói: %s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Lệnh PASS (mật khẩu) đã thất bại: máy phục vụ nói: %s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -2032,307 +2044,312 @@ msgstr ""
 "Đã ghi rõ máy phục vụ ủy nhiệm, nhưng mà chưa ghi rõ tập lệnh đăng nhập. « "
 "Acquire::ftp::ProxyLogin » là rỗng."
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Lệnh tập lệnh đăng nhập « %s » đã thất bại: máy phục vụ nói: %s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Lệnh TYPE (kiểu) đã thất bại: máy phục vụ nói: %s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "Thời hạn kết nối"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "Máy phục vụ đã đóng kết nối"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "Lỗi đọc"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "Một trả lời đã tràn bộ đệm."
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Giao thức bị hỏng"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "Lỗi ghi"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "Không thể tạo ổ cắm"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "Không thể kết nối ổ cắm dữ liệu, kết nối đã quá giờ"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Không thể kết nối ổ cắm bị động."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo (lấy thông tin địa chỉ) không thể lấy ổ cắm lắng nghe"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "Không thể đóng kết ổ cắm"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "Không thể lắng nghe trên ổ cắm đó"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "Không thể quyết định tên ổ cắm đó"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "Không thể gởi lệnh PORT (cổng)"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Không biết nhóm địa chỉ %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Lệnh EPRT (thông báo lỗi) đã thất bại: máy phục vụ nói: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Quá giờ kết nối ổ cắm dữ liệu"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "Không thể chấp nhận kết nối"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "Gặp khó khăn khi tạo chuỗi duy nhất cho tập tin"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Không thể lấy tập tin: máy phục vụ nói « %s »"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Ổ cắm dữ liệu đã quá giờ"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Việc truyền dữ liệu bị lỗi: máy phục vụ nói « %s »"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "Truy vấn"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "Không thể gọi "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Đang kết nối đến %s (%s)..."
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[Địa chỉ IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, 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:103
+#: methods/connect.cc:107
 #, 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:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "Đang kết nối đến %s..."
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Không thể tháo gỡ « %s »"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Việc tháo gỡ « %s » bị lỗi tạm thời"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, 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:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Không thể kết nối đến %s: %s:"
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 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 khóa ?!"
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 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:175
+#: methods/gpgv.cc:181
 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 cài đặt chưa?)"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "Gặp lỗi không rõ khi thực hiện gpgv"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 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:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 "Không thể kiểm chứng những chữ ký theo đây, vì khóa công không sẵn sàng:\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "Đang đợi những phần đầu..."
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Đã lấy một dòng đầu riêng lẻ chứa hơn %u ky tự"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "Dòng đầu sai"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Máy phục vụ HTTP đã gởi một dòng đầu trả lời không hợp lệ"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 "Máy phục vụ HTTP đã gởi một dòng đầu Content-Length (độ dài nội dụng) không "
 "hợp lệ"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 "Máy phục vụ HTTP đã gởi một dòng đầu Content-Range (phạm vị nội dụng) không "
 "hợp lệ"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "Không rõ dạng ngày"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "Việc chọn bị lỗi"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "Kết nối đã quá giờ"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "Gặp lỗi khi ghi vào tập tin xuất"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "Gặp lỗi khi ghi vào tập tin"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "Gặp lỗi khi ghi vào tập tin đó"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 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:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "Gặp lỗi khi đọc từ máy phục vụ"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Lỗi cắt ngắn tập tin"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "Dữ liệu dòng đầu sai"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "Kết nối bị ngắt"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "Gặp lỗi nội bộ"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Không thể mmap (ảnh xạ bộ nhớ) tâp tin rỗng"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Không thể nhân đôi bộ mô tả tập tin %i"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %lu byte"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "Không thể đóng mmap (ảnh xạ bộ nhớ)"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "Không thể động bộ hoá mmap (ảnh xạ bộ nhớ)"
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %lu byte"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Lỗi cắt ngắn tập tin"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2342,14 +2359,14 @@ msgstr ""
 "Hãy tăng kích cỡ của « APT::Cache-Limit » (giới hạn vùng nhớ tạm Apt).\n"
 "Giá trị hiện thời:  %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr "Không thể tăng kích cỡ của ảnh xạ bộ nhớ, vì đã tới giới hạn %lu byte."
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2380,94 +2397,94 @@ msgstr "%liphút %ligiây"
 msgid "%lis"
 msgstr "%ligiây"
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "Không tìm thấy vùng chọn %s"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Không nhận biết viết tắt kiểu: « %c »"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Đang mở tập tin cấu hình %s..."
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Gặp lỗi cú pháp %s:%u: khối bắt đầu không có tên."
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Gặp lỗi cú pháp %s:%u: thẻ dạng sai"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Gặp lỗi cú pháp %s:%u: có rác thêm sau giá trị"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Gặp lỗi cú pháp %s:%u: có thể thực hiện chỉ thị chỉ tại mức đầu"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Gặp lỗi cú pháp %s:%u: quá nhiều điều bao gồm lồng nhau"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Gặp lỗi cú pháp %s:%u: đã bao gồm từ đây"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Gặp lỗi cú pháp %s:%u: chưa hỗ trợ chỉ thị « %s »"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 "Gặp lỗi cú pháp %s:%u: chỉ thị rõ thì yêu cầu một cây tuỳ chọn làm đối số"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Gặp lỗi cú pháp %s:%u: gặp rác thêm tại kết thúc tập tin"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Lỗi."
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Hoàn tất"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Không rõ tùy chọn dòng lệnh « %c » [từ %s]."
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Không hiểu tùy chọn dòng lệnh %s"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Tùy chọn dòng lệnh %s không phải bun (đúng/không đúng)"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Tùy chọn %s yêu cầu một đối số."
@@ -2477,346 +2494,359 @@ msgstr "Tùy chọn %s yêu cầu một đối số."
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Tùy chọn %s: đặc tả mục cấu hình phải có một « =<giá_trị> »."
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Tùy chọn %s yêu cầu một đối số kiểu số nguyên, không phải « %s »"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Tùy chọn « %s » quá dài"
 
-#: 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 "Không hiểu %s: hãy cố dùng true (đúng) hay false (không đúng)."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Thao tác không hợp lệ %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Không thể lấy các thông tin cho điểm gắn kết %s"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Không thể chuyển đổi sang %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "Việc lấy cac thông tin cho đĩa CD-ROM bị lỗi"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, 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:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, 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:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, 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:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Không thể lấy khóa %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Đã đợi %s nhưng mà chưa gặp nó"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, 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:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, 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:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, 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:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, 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:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "Không thể mở tập tin %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, 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:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+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:1019
+msgid "Failed to exec compressor "
+msgstr "Việc thực hiện bô nén bị lỗi "
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "đọc, còn cần đọc %lu nhưng mà không có gì còn lại"
 
-#: apt-pkg/contrib/fileutl.cc:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "ghi, còn cần ghi %lu nhưng mà không thể"
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Gặp vấn đề khi đóng tập tin gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Gặp vấn đề khi đóng tập tin %s"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, 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:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, 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:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "Gặp vấn đề khi đồng bộ hóa tập tin"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "Bộ nhớ tạm gói trống"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "Tập tin nhớ tạm gói bị hỏng"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "Tập tin nhớ tạm gói là một phiên bản không tương thích"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Tập tin nhớ tạm gói bị hỏng"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên bản « %s »"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 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:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "Phụ thuộc"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "Phụ thuộc sẵn"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "Đề nghị"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "Khuyến khích"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "Xung đột"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "Thay thế"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "Làm cũ"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "Làm hư"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "Tăng cường"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "quan trọng"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "yêu cầu"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "chuẩn"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "tùy chọn"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "bổ sung"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "Đang xây dựng cây quan hệ phụ thuộc"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "Phiên bản ứng cử"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "Tạo ra quan hệ phụ thuộc"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "Đang đọc thông tin về tình trạng"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Lỗi mở tập tin tình trạng StateFile %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Lỗi ghi tập tin tình trạng StateFile tạm thời %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Không thể phân tích tập tin gói %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Không thể phân tích tập tin gói %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 "Gặp dòng dạng sai %lu trong danh sách nguồn %s ([tùy chọn] không phân tích "
 "được)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 "Gặp dòng dạng sai %lu trong danh sách nguồn %s ([%s] không phải là một sự "
 "gán)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 "Gặp dòng dạng sai %lu trong danh sách nguồn %s ([%s] không có khoá nào)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 "Gặp dòng dạng sai %lu trong danh sách nguồn %s (khoá [%s] %s không có giá "
 "trị)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (địa chỉ URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 "Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách địa chỉ URI)."
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 "Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 "Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách bản phân phối)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "Đang mở %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 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:281
+#: apt-pkg/sourcelist.cc:285
 #, 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:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2825,7 +2855,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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Không thể mở tập tin « %s »"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2837,27 +2872,18 @@ msgstr ""
 "bạn thật sự muốn tiếp tục, có thể hoạt hóa tuy chọn « APT::Force-LoopBreak "
 "» (buộc ngắt vòng lặp)."
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"Không thể thực hiện ngay lập tức tiến trình cấu hình « %s » đã giải nén. Xem "
-"« man 5 apt.conf  » dưới « APT::Immediate-Configure » để tìm chi tiết."
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Không hỗ trợ kiểu tập tin chỉ mục « %s »"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 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:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2865,11 +2891,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:1160
+#: apt-pkg/algorithms.cc:1193
 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:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2878,237 +2904,197 @@ msgstr ""
 "Một số tập tin chỉ mục không tải về được, đã bỏ qua chúng, hoặc điều cũ được "
 "dùng thay thế."
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Thiếu thư mục danh sách %spartial."
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Thiếu thư mục kho lưu %spartial."
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "Không thể khoá thư mục %s"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Đang lấy tập tin %li trên %li (%s còn lại)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Đang lấy tập tin %li trên %li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Không tìm thấy trình điều khiển phương pháp %s."
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 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:423
+#: apt-pkg/acquire-worker.cc:425
 #, 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:147
+#: 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:163
+#: 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"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Không thể lấy trạng thái về %s."
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 "Bạn phải để một số địa chỉ URI « nguồn » vào « sources.list » (danh sách "
 "nguồn)"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Không thể phân tích hay mở danh sách gói hay tâp tin trạng thái."
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 "Có lẽ bạn muốn chạy « apt-get update » (lấy cập nhật) để sửa các vấn đề này"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "Không thể đọc danh sách nguồn."
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 "Gặp mục ghi sai trong tập tin tùy thích %s: không có dòng đầu Package (Gói)."
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Không hiểu kiểu ghim %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "Bộ nhớ tạm có hệ thống điêu khiển phiên bản không tương thích"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Gặp lỗi khi xử lý %s (NewPackage - gói mới)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Gặp lỗi khi xử lý %s (UsePackage1 - dùng gói 1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Gặp lỗi khi xử lý %s (NewFileDesc1 - tập tin mô tả mới 1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Gặp lỗi khi xử lý %s (UsePackage2 - dùng gói 2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Gặp lỗi khi xử lý %s (NewFileVer1 - tập tin mới, phiên bản 1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Gặp lỗi khi xử lý %s (NewVersion%d)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Gặp lỗi khi xử lý %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Gặp lỗi khi xử lý %s (NewFileDesc2)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Gặp lỗi khi xử lý %s (FindPkg - tìm gói)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý."
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý."
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "Ồ, bạn đã vượt quá số mô tả mà trình APT này có thể quản lý."
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 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:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Gặp lỗi khi xử lý %s (FindPkg - tìm gói)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr ""
-"Gặp lỗi khi xử lý %s (CollectFileProvides - tập hợp các trường hợp miễn là "
-"một tập tin)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, 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ý cách phụ thuộc của/vào tập tin"
 
-#: apt-pkg/pkgcachegen.cc:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, 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:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "Đang tập hợp các trường hợp « tập tin miễn là »"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)."
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "Sai khớp MD5Sum (tổng kiểm)"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Sai khớp tổng chuỗi duy nhất (hash sum)"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1450
 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:1488
 #, 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:1510
 #, 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:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3119,12 +3105,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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Lỗi GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3133,7 +3119,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:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3142,7 +3128,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:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3150,44 +3136,44 @@ 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:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "Sai khớp kích cỡ"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, 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:63
+#: apt-pkg/indexrecords.cc:71
 #, 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:97
+#: apt-pkg/indexrecords.cc:105
 #, 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:110
+#: apt-pkg/indexrecords.cc:118
 #, 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:125
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr ""
 "Gặp mục nhập « Date » (ngày tháng) không hợp lệ trong tập tin Phát hành %s"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Khối nhà bán %s không chứa vân tay"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3196,41 +3182,41 @@ msgstr ""
 "Đang dùng điểm lắp đĩa CD-ROM %s\n"
 "Đang lắp đĩa CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "Đang nhận diện... "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Nhãn đã lưu : %s\n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "Đang tháo lắp đĩa CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Đang dùng điểm lắp đĩa CD-ROM %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "Đang tháo lắp đĩa CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "Đang đợi đĩa...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "Đang lắp đĩa CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3238,7 +3224,7 @@ msgid ""
 msgstr ""
 "Tìm thấy %zu chỉ mục gói, %zu chỉ mục nguồn, %zu chỉ mục dịch và %zu chữ ký\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3246,16 +3232,16 @@ msgstr ""
 "Không tìm thấy tập tin gói nào, có thể vì đây không phải là một Đĩa Debian, "
 "hoặc có kiến trúc không đúng ?"
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Tìm thấy nhãn « %s »\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "Nó không phải là một tên hợp lệ: hãy thử lại.\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3264,92 +3250,92 @@ msgstr ""
 "Tên đĩa này:\n"
 "« %s »\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "Đang sao chép các danh sách gói..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "Đang ghi danh sách nguồn mới\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 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:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Mới ghi %i mục ghi.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, 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:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, 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:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Mới ghi %i mục ghi với %i tập tin còn thiếu và %i tập tin không khớp với "
 "nhau\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Đang bỏ qua tập tin không tồn tại %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "Không tìm thấy mục ghi xác thực cho : %s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Sai khớp chuỗi duy nhất cho : %s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, 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:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Không tìm thấy bản phát hành « %s » cho « %s »"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Không tìm thấy phiên bản « %s » cho « %s »"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Không tìm thấy tác vụ « %s »"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Không tìm thấy gói nào theo biểu thức chính quy « %s »"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "Không thể chọn phiên bản trong gói « %s » vì nó chỉ là ảo"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3358,123 +3344,147 @@ msgstr ""
 "Không thể chọn phiên bản được cài đặt hoặc phiên bản ứng cử trong gói « %s » "
 "mà không có trong nó"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr "Không thể chọn phiên bản mới nhất trong gói « %s » vì nó chỉ là ảo"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr "Không thể chọn phiên bản ứng cử trong gói %s vì nó không có ứng cử"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Không thể chọn phiên bản được cài đặt trong gói %s vì nó không phải được cài "
 "đặt"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "Đang cài đặt %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "Đang cấu hình %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "Đang gỡ bỏ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "Đang gỡ bỏ hoàn toàn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, 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:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, 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:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Thiếu thư mục « %s »"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Không thể mở tập tin « %s »"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "Đang chuẩn bị %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "Đang mở gói %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Đang chuẩn bị cấu hình %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "Đã cài đặt %s"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Đang chuẩn bị gỡ bỏ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "Đã gỡ bỏ %s"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, 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:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "Mới gỡ bỏ hoàn toàn %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 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:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "Đang chạy dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 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:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3482,25 +3492,25 @@ 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:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr "Không ghi báo cáo apport, vì thông điệp lỗi ngụ ý một lỗi « đĩa đầy »"
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 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:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 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 »"
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
@@ -3509,44 +3519,44 @@ msgstr ""
 "Không thể khoá thư mục quản lý (%s): có một tiến trình khác đang sử dụng nó "
 "không?"
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Không thể khoá thư mục quản lý (%s): bạn có quyền người chủ không?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "dpkg bị gián đoạn, bạn cần phải tự động chạy « %s » để giải vấn đề này."
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Không phải bị khoá"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "Không tìm thấy tập tin nhân bản « %s »"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Không tìm thấy tập tin nhân bản « %s »"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Nhân bản: %s]"
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3555,7 +3565,7 @@ msgstr ""
 "Không thể vá lỗi %s dùng mmap và cách sử dụng tập tin: có vẻ là đắp vá bị "
 "hỏng."
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3564,10 +3574,70 @@ msgstr ""
 "Không thể vá lỗi %s dùng mmap (mà không có lỗi đặc trưng cho mmap): có vẻ là "
 "đắp vá bị hỏng."
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Kết nối bị đóng quá sớm."
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Ghi chú : thay đổi này được tự động làm bởi dpkg."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Điều đè dạng sai %s dòng %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Điều đè dạng sai %s dòng %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Điều đè dạng sai %s dòng %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "bộ giải nén"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "đọc, còn cần đọc %lu nhưng mà không có gì còn lại"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "ghi, còn cần ghi %lu nhưng mà không thể"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "Không thể thực hiện ngay lập tức tiến trình cấu hình « %s » đã giải nén. "
+#~ "Xem « man 5 apt.conf  » dưới « APT::Immediate-Configure » để tìm chi tiết."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Gặp lỗi khi xử lý %s (NewPackage - gói mới)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Gặp lỗi khi xử lý %s (UsePackage1 - dùng gói 1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Gặp lỗi khi xử lý %s (NewFileDesc1 - tập tin mô tả mới 1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Gặp lỗi khi xử lý %s (UsePackage2 - dùng gói 2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Gặp lỗi khi xử lý %s (NewFileVer1 - tập tin mới, phiên bản 1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Gặp lỗi khi xử lý %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Gặp lỗi khi xử lý %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Gặp lỗi khi xử lý %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Gặp lỗi khi xử lý %s (FindPkg - tìm gói)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr ""
+#~ "Gặp lỗi khi xử lý %s (CollectFileProvides - tập hợp các trường hợp miễn "
+#~ "là một tập tin)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "Gặp lỗi nội bộ, không thể định vị bộ phạn"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0ae36fef2..bb740d586 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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"
@@ -19,149 +19,150 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "软件包名称总数："
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "全部软件包结构："
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  普通软件包："
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  完全虚拟软件包："
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  单虚拟软件包："
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  混合虚拟软件包："
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  缺失："
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "按版本共计："
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "按不同的说明共计："
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "按依赖关系共计："
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "按版本/文件关系共计："
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "按说明/文件关系共计："
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "提供映射共计："
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Glob 字串共计："
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "依赖关系版本名所占空间共计："
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Slack 空间共计："
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "总占用空间："
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "软件包文件 %s 尚未同步。"
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "没有发现匹配的软件包"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "您必须明确地给出至少一个表达式"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "未发现软件包 %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "软件包文件："
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "被锁定的软件包："
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(没有找到)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  已安装："
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  候选软件包："
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(无)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  软件包锁："
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  版本列表："
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -235,28 +236,28 @@ msgstr ""
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 "若要了解更多信息，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n"
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 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:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "请把盘片插入驱动器再按回车键"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "无法将 %s 挂载到 %s"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "参数没有成对"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -284,12 +285,12 @@ msgstr ""
 "  -c=? 读取指定的配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如：-o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s 不是一个有效的 DEB 软件包。"
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -313,40 +314,40 @@ msgstr ""
 "  -c=? 读指定的配置文件\n"
 "  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "无法写入 %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "软件包的扩展列表太长"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "源扩展列表太长"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "将头写入到目录文件时出错"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "处理目录 %s 时出错"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -426,137 +427,137 @@ msgstr ""
 "  -c=?  读取指定配置文件\n"
 "  -o=?  设置任意指定的配置选项"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "没有任何选定项是匹配的"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "软件包文件组“%s”中缺少一些文件"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "数据库被损坏，该数据库文件的文件名已改成 %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "数据库已过期，现尝试进行升级 %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
 "数据库格式无效。如果您是从一个老版本的 apt 升级而来，请删除数据库并重建它。"
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, 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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "无法获得 %s 的状态"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "归档文件没有包含控制字段"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "无法获得游标"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "警告：无法读取目录 %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "警告：无法获得 %s 的状态\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "错误："
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "警告："
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "错误：处理文件时出错 "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "无法解析 %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "无法遍历目录树"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "无法打开 %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "无法读取符号链接 %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "无法使用 unlink 删除 %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** 无法将 %s 链接到 %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " 达到了 DeLink 的上限 %sB。\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "归档文件没有包含 package 字段"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s 中没有 override 项\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: 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:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s 没有源代码的 override 项\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s 中没有二进制文件的 override 项\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - 分配内存失败"
 
@@ -566,18 +567,18 @@ msgid "Unable to open %s"
 msgstr "无法打开 %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -585,63 +586,51 @@ msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
 msgid "Failed to read the override file %s"
 msgstr "无法读取 override 文件 %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "未知的压缩算法“%s”"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "无法为子进程创建 IPC 管道"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "无法创建 FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "无法 fork"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "压缩子进程"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "内部错误，无法创建 %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "无法创建子进程的 IPC 管道"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "无法执行压缩程序"
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "解压程序"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "无法对子进程或文件进行读写"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "在计算 MD5 校验和时无法读取数据"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "在使用 unlink 删除 %s 时出错"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "无法将 %s 重命名为 %s"
@@ -650,75 +639,79 @@ msgstr "无法将 %s 重命名为 %s"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "编译正则表达式时出错 - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "下列软件包有未满足的依赖关系："
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "但是 %s 已经安装"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "但是 %s 正要被安装"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "但无法安装它"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "但是它是虚拟软件包"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "但是它还没有被安装"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "但是它将不会被安装"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr " 或"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "下列【新】软件包将被安装："
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "下列软件包将被【卸载】："
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "下列软件包的版本将保持不变："
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "下列软件包将被升级："
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "下列软件包将被【降级】："
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "下列被要求保持版本不变的软件包将被改变："
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (是由于 %s) "
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -726,59 +719,59 @@ msgstr ""
 "【警告】：下列基础软件包将被卸载。\n"
 "请勿尝试，除非您确实知道您在做什么！"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "重新安装了 %lu 个软件包，"
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "降级了 %lu 个软件包，"
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "注意，为任务 %2$s 选中了 %1$s\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "注意，根据正则表达式 %2$s 选中了 %1$s\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [已安装]"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr " [无候选版本]"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "请您明确地选择一个来进行安装。"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -789,177 +782,177 @@ msgstr ""
 "这可能意味着这个缺失的软件包可能已被废弃，\n"
 "或者只能在其他发布源中找到\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "可是下列软件包取代了它："
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "软件包 %s 没有可供安装的候选者"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "类似 %s 的虚拟软件包可以卸载\n"
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "注意，选取 %s 而非 %s\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "不能重新安装 %s，因为无法下载它。\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s 已经是最新的版本了。\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 被设置为手动安装。\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "软件包 %s 还未安装，因而不会被卸载\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "正在更正依赖关系..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " 失败。"
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "无法更正依赖关系"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "无法最小化要升级的软件包集合"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " 完成"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "【警告】：下列软件包不能通过验证！"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "忽略了认证警告。\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "不经验证就安装这些软件包吗？[y/N] "
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "有些软件包不能通过验证"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。"
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "内部错误，Ordering 未能完成"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "怪了……文件大小不符，请发信给 apt@packages.debian.org 吧"
 
 #. 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:1142
+#: cmdline/apt-get.cc:1156
 #, 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:1147
+#: cmdline/apt-get.cc:1161
 #, 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:1154
+#: cmdline/apt-get.cc:1168
 #, 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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "解压缩后将会空出 %sB 的空间。\n"
 
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "无法获知您在 %s 上的可用空间"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "您在 %s 上没有足够的可用空间。"
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。"
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "是，按我说的做！"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -970,28 +963,28 @@ msgstr ""
 "若还想继续的话，就输入下面的短句“%s”\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "中止执行。"
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "您希望继续执行吗？[Y/n]"
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "无法下载 %s  %s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "有一些文件无法下载"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "下载完毕，目前是“仅下载”模式"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -999,19 +992,19 @@ msgstr ""
 "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项"
 "再试试？"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "目前还不支持 --fix-missing 和介质交换"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "无法更正缺少的软件包。"
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "中止安装。"
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1020,35 +1013,35 @@ msgid_plural ""
 "all files have been overwritten by other packages:"
 msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失："
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr "注意：这是自动被 dpkg 有意完成的。"
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "选择 %s 作为源代码包而非 %s\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr " update 命令不需要参数"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "我们不应该进行删除，无法启动自动删除器"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1064,15 +1057,15 @@ msgstr "似乎自动卸载工具损坏了一些软件，这不应该发生。请
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "下列信息可能会对解决问题有所帮助："
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "内部错误，自动卸载工具坏事了"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1080,26 +1073,26 @@ msgid_plural ""
 "required:"
 msgstr[0] "下列软件包是自动安装的并且现在不需要了："
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, 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 个自动安装的的软件包现在已不再需要了。\n"
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "使用'apt-get autoremove'来卸载它们"
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "内部错误，全部升级工具坏事了"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1107,7 +1100,7 @@ msgstr ""
 "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
 "以指定一个解决办法)。"
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1118,73 +1111,73 @@ msgstr ""
 "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
 "包尚未被创建或是它们已被从新到(Incoming)目录移出。"
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "破损的软件包"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "将会安装下列额外的软件包："
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "建议安装的软件包："
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "推荐安装的软件包："
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "无法找到软件包 %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s 被设置为手动安装。\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "正在对升级进行计算... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "失败"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "完成"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "内部错误，问题解决工具坏事了"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "无法锁定下载目录"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr "要下载源代码，必须指定至少一个对应的软件包"
 
-#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "无法找到与 %s 对应的源代码包"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1193,7 +1186,7 @@ msgstr ""
 "提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1204,104 +1197,104 @@ msgstr ""
 "bzr get %s\n"
 "获得该软件包的最近更新(可能尚未正式发布)。\n"
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "忽略已下载过的文件“%s”\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下载 %sB 的源代码包。\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下载源代码 %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "有一些包文件无法下载。"
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "忽略已经被解包到 %s 目录的源代码包\n"
 
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "运行解包的命令“%s”出错。\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
 
-#: cmdline/apt-get.cc:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "执行构造软件包命令“%s”失败。\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "子进程出错"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包"
 
-#: cmdline/apt-get.cc:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "无法获得 %s 的构建依赖关系信息"
 
-#: cmdline/apt-get.cc:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr " %s 没有构建依赖关系信息。\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, 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:2889
+#: cmdline/apt-get.cc:2924
 #, 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:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1310,37 +1303,37 @@ msgstr ""
 "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 "
 "%1$s 依赖关系"
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, 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:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "无法处理构建依赖关系"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "正在连接 %s (%s)"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "支持的模块："
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1428,7 +1421,7 @@ msgstr ""
 "以获取更多信息和选项。\n"
 "                       本 APT 具有超级牛力。\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1439,33 +1432,33 @@ msgstr ""
 "　　　apt-get 需要 root 特权进行实际的执行。\n"
 "　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！"
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "命中 "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "获取："
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "忽略 "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "错误 "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "下载 %sB，耗时 %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [执行中]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1476,46 +1469,62 @@ msgstr ""
 "“%s”\n"
 "的盘片插入驱动器“%s”再按回车键\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "但是它还没有被安装"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s 被设置为手动安装。\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s 被设置为手动安装。\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s 已经是最新的版本了。\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s 已经是最新的版本了。\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s 已设置为手动安装。\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "无法打开 %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1537,11 +1546,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "未知的软件包记录！"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1599,196 +1608,198 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们，
 msgid "Merging available information"
 msgstr "正在合并可用信息"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "无法创建管道"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "无法执行 gzip"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "包文件已被损坏"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar 的校验和不符，文件已损坏"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "未知的 TAR 数据头类型 %u，成员 %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "无效的归档签名"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "读取归档成员文件头出错"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr "归档文件中成员文件头 %s 无效"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "归档文件中成员文件头无效"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "归档文件太短"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "无法读取归档文件的数据头"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "把 DropNode 用在了仍在链表中的节点上"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "无法定位哈希表元素！"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "无法分配转移项"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "内部错误，出现在 AddDiversion"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "添加了两个转移项 %s-> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "重复的配置文件 %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "无法写入文件 %s"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "无法关闭文件 %s"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "路径名 %s 太长"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s 被解包了不只一次"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "目录 %s 已被转移"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "该软件包正尝试写入转移对象 %s/%s"
 
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "该转移路径太长"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "目录 %s 要被一个非目录的文件替换"
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "无法在其散列桶中分配节点"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "路径名太长"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "用来覆盖的软件包不属于 %s 的任何版本"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "无法读取 %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "无法读取 %s 的状态"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "无法卸载 %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "无法创建 %s "
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "无法读取 %sinfo 的状态"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "info 和 temp 目录要求处于同一文件系统之下"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "正在读取软件包列表"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "无法切换工作目录到 admin 目录 %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "在获取软件包名字时出现内部错误"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "正在读取文件列表"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1798,113 +1809,114 @@ msgstr ""
 "无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件，那么就清空该文件并马上重"
 "新安装相同版本的这个软件包！"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "无法读取列表文件 %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "获得一个节点时出现内部错误"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "无法打开转移配置文件 %sdiversions"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 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
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "转移配置文件中有一行是无效的：%s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "添加转移配置时出现内部错误"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "必须首先初始化软件包缓存"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "无法找到某个软件包：包头，于偏移位置 %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "解析 MD5 出错。文件内偏移量为 %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”，“%s”或者“%s”"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "无法切换工作目录到 %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "内部错误，无法定位包内文件 %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "无法在归档文件中找到有效的主控文件"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "不能解析的主控文件"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "无法为 %s 开启管道"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "从 %s 进程读取数据出错"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "无法读取状态"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "无法设置文件的修改日期"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "无法读取盘片数据库 %s"
 
-#: methods/cdrom.cc:208
+#: 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"
@@ -1912,357 +1924,362 @@ msgstr ""
 "请使用 apt-cdrom，通过它就可以让 APT 能识别该盘片。apt-get upgdate 不能被用来"
 "加入新的盘片。"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "错误的 CD-ROM"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。"
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "找不到盘片。"
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "无法找到该文件"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "无效的 URI，本地的 URI 不能以 // 开头"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "正在登录"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "无法获知对方主机名"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "无法获知本地主机名"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "服务器拒绝了我们的连接，响应信息为：%s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER 指令出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS 指令出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 "您指定了代理服务器，但是没有登陆脚本，Acquire::ftp::ProxyLogin 设置为空。"
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE 指令出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "连接超时"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "服务器关闭了连接"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "读错误"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "回应超出了缓存区大小。"
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "协议有误"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "写出错"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "无法创建套接字"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "无法连接上数据套接字，连接超时"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "无法连接被动模式的套接字。"
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo 无法得到监听套接字"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "无法绑定套接字"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "无法在套接字上监听"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "无法确定套接字的名字"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "无法发出 PORT 指令"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "无法识别的地址族 %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT 指令出错，服务器响应信息为：%s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "数据套接字连接超时"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "把文件加入哈希表时出错"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "无法获取文件，服务器响应信息为“%s”"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "数据套接字超时"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "数据传送出错，服务器响应信息为“%s”"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "查询"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "无法调用 "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "正在连接 %s (%s)"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "无法发起与 %s:%s (%s) 的连接"
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "无法连接上 %s:%s (%s)，连接超时"
 
-#: methods/connect.cc:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "正在连接 %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "无法解析域名“%s”"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "暂时不能解析域名“%s”"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "不能连接到 %s：%s："
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！"
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "至少发现一个无效的签名。"
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗？)"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "运行 gpgv 时发生未知错误"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "下列签名无效：\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "由于没有公钥，无法验证下列签名：\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "正在等待报头"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "接收到一行报头行，它的长度超过了 %u 个字符"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "错误的报头行"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "该 HTTP 服务器发送了一个无效的应答报头"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "该 HTTP 服务器的 range 支持不正常"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "无法识别的日期格式"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "select 调用出错"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "连接超时"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "写输出文件时出错"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "写入文件出错"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "写入文件出错"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "从服务器读取数据时出错，对方关闭了连接"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "从服务器读取数据出错"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "无法截断文件"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "错误的报头数据"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "内部错误"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "无法 mmap 一个空文件"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "无法为复制文件描述符 %i"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "无法 mmap %lu 字节的数据"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
 msgstr "无法关闭 mmap"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 msgid "Unable to synchronize mmap"
 msgstr "无法同步 mmap "
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "无法 mmap %lu 字节的数据"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "无法截断文件"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2271,14 +2288,14 @@ msgstr ""
 "动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大小。当前值：%lu。(man 5 "
 "apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr "无法增加 MMap 的大小，因为已经达到 %lu 字节的限制。"
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。"
@@ -2307,93 +2324,93 @@ msgstr "%li分 %li秒"
 msgid "%lis"
 msgstr "%li秒"
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "找不到您选则的 %s"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "无法识别的类型缩写：“%c”"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "正在打开配置文件 %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "语法错误 %s:%u：配置小节没有以名字开头"
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "语法错误 %s:%u：标签格式有误"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "语法错误 %s:%u：配置值后有多余的无意义数据"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "语法错误 %s:%u：只能在顶层配置文件中使用指示"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "语法错误 %s:%u：Included from here"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "语法错误 %s:%u：不支持的指令“%s”"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr "语法错误 %s:%u：clean 指令需要一个选项树作为参数"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... 有错误！"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... 完成"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "未知的命令行选项“%c” [来自 %s]"
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "无法识别命令行选项 %s"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "命令行选项 %s 不是布尔值"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "选项 %s 要求有一个参数"
@@ -2403,336 +2420,349 @@ msgstr "选项 %s 要求有一个参数"
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定"
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "选项“%s”太长"
 
-#: 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 "不能识别参数 %s，请用 true 或 false"
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "无效的操作 %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "无法读取文件系统挂载点 %s 的状态"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "无法切换工作目录到 %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "无法读取盘片的状态"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "由于文件系统为只读，因而无法使用文件锁 %s"
 
-#: apt-pkg/contrib/fileutl.cc:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "无法打开锁文件 %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "无法在 nfs 文件系统上使用文件锁 %s"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "无法获得锁 %s"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "等待子进程 %s 的退出，但是它并不存在"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "子进程 %s 发生了段错误"
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "子进程 %s 收到信号 %u。"
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "子进程 %s 返回了一个错误号 (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "子进程 %s 异常退出"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "无法打开文件 %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "无法打开文件描述符 %d"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "无法创建子进程的 IPC 管道"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "无法执行压缩程序"
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "读取文件出错，还剩 %lu 字节没有读出"
 
-#: apt-pkg/contrib/fileutl.cc:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "写入文件出错，还剩 %lu 字节没有保存"
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "关闭 gzip %s 文件出错"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "关闭文件 %s 出错"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "重命名文件 %s 为 %s 出错"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "用 unlink 删除文件 %s 出错"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "同步文件出错"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "软件包缓存区是空的"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "软件包缓存文件损坏了"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "软件包缓存区文件的版本不兼容"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "软件包缓存文件损坏了"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "本程序目前不支持“%s”版本系统"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "软件包缓存区是为其它架构的硬件构建的"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "依赖"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "预依赖"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "建议"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "推荐"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "冲突"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "替换"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "废弃"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "破坏"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr "增强"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "重要"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "必需"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "标准"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "可选"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "额外"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "正在分析软件包的依赖关系树"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "候选版本"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "生成依赖关系"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "正在读取状态信息"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "无法打开状态文件 %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "无法写入临时状态文件 %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "无法解析软件包文件 %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "无法解析软件包文件 %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "正在打开 %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "源列表 %2$s 的第 %1$u 行太长了。"
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2741,7 +2771,12 @@ msgstr ""
 "无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure "
 "(%d)"
 
-#: apt-pkg/packagemanager.cc:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "无法打开文件 %s"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2752,27 +2787,18 @@ msgstr ""
 "少的软件包 %s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::"
 "Force-LoopBreak 选项。"
 
-#: apt-pkg/packagemanager.cc:501
-#, 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 ""
-"无法立即对已经解包的 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-"
-"Configure。"
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "不支持索引文件类型“%s”"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。"
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2780,13 +2806,13 @@ msgstr ""
 "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的"
 "缘故。"
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关"
 "系。"
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -2794,231 +2820,193 @@ msgid ""
 msgstr ""
 "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "软件包列表的目录 %spartial 缺失。"
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "仓库目录 %spartial 确实。"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
 msgstr "无法对目录 %s 加锁"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "正在下载第 %li 个文件，共 %li 个"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
 
-#: apt-pkg/init.cc:147
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "不支持“%s”打包系统"
 
-#: apt-pkg/init.cc:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "无法确定适合的打包系统类型"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "无法读取 %s 的状态。"
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "无法解析或打开软件包的列表或是状态文件。"
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "您可能需要运行 apt-get update 来解决这些问题"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "无法读取源列表。"
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "无法识别锁定的类型 %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "没有为版本锁定指定优先级(或为零)"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "软件包暂存区使用的是不兼容的版本控制系统"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "处理 %s (NewPackage)时出错"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "处理 %s (UsePackage1)时出错"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "处理 %s (NewFileDesc1)时出错"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "处理 %s (UsePackage2)时出错"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "处理 %s (NewFileVer1)时出错"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
-#, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "处理 %s (NewVersion%d)时出错"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "处理 %s (UsePackage3)时出错"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "处理 %s (NewFileDesc2)时出错"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "处理 %s (FindPkg)时出错"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "哇，软件包数量超出了本 APT 的处理能力。"
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
 
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "处理 %s (FindPkg)时出错"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "处理 %s (CollectFileProvides)时出错"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "当处理文件依赖关系时，无法找到软件包 %s %s"
 
-#: apt-pkg/pkgcachegen.cc:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "无法获取源软件包列表 %s 的状态"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "正在收集文件所提供的软件包"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "无法读取或写入软件源缓存"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "无法重命名文件，%s (%s -> %s)。"
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "MD5 校验和不符"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Hash 校验和不符"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, 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:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3027,12 +3015,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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG 错误：%s: %s"
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3041,7 +3029,7 @@ msgstr ""
 "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
 "包。(缘于架构缺失)"
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1709
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3049,47 +3037,47 @@ msgid ""
 msgstr ""
 "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
 
-#: apt-pkg/acquire-item.cc:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "大小不符"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "无法解析软件包仓库 Release 文件 %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "软件提供者数据块内 %s 没有包含指纹信息"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3098,41 +3086,41 @@ msgstr ""
 "现把 %s 作为了 CD-ROM 的挂载点\n"
 "正在挂载 CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "正在鉴别.. "
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "已归档文件的标签：%s\n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "正在卸载 CD-ROM...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "正在卸载 CD-ROM 文件系统\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "等待插入盘片……\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "正在挂载 CD-ROM 文件系统……\n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "正在盘片中查找索引文件..\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3141,7 +3129,7 @@ msgstr ""
 "找到了 %zu 个软件包索引、%zu 个源代码包索引、%zu 个翻译索引和 %zu 个数字签"
 "名\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
@@ -3149,16 +3137,16 @@ msgstr ""
 "无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构"
 "架。"
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "找到标签 '%s'\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "这不是一个有效的名字，请重试。\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3167,293 +3155,375 @@ msgstr ""
 "这张盘片现在的名字是：\n"
 "“%s”\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "正在复制软件包列表……"
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "正在写入新的源列表\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "对应于该盘片的软件源设置项是：\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "已写入 %i 条记录。\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n"
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "跳过不存在的文件 %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "无法找到认证记录：%s"
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash 校验和不符：%s"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "%s 中没有安装密钥环。"
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”发布版本"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”版本"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "无法找到任务 %s"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "无法按照正则表达式 %s 找到任何软件包"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "无法从完全虚拟的软件包 %s 中选择版本"
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择"
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版"
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr "因为软件包 %s 没有候选版本，无法进行选择"
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本"
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "正在安装 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "正在配置 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "正在删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, c-format
 msgid "Completely removing %s"
 msgstr "完全删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "注意到 %s 已经消失"
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "执行安装后执行的触发器 %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "目录 %s 缺失"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "无法打开文件 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "正在准备 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解压缩 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在准备配置 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "已安装 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "正在准备 %s 的删除操作"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "已删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "正在准备完全删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ？)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr "正在运行 dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 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:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr "依赖问题 - 保持未配置"
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 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:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。"
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。"
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？"
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。"
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "未锁定"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr "没有找到镜像文件 %s"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "没有找到镜像文件 %s"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[镜像：%s]"
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。"
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。"
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "连接被永久关闭"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "注意：这是自动被 dpkg 有意完成的。"
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
+
+#~ msgid "decompressor"
+#~ msgstr "解压程序"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "读取文件出错，还剩 %lu 字节没有读出"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "写入文件出错，还剩 %lu 字节没有保存"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "无法立即对已经解包的 %s 进行配置。请查看 man 5 apt.conf 中的 APT::"
+#~ "Immediate-Configure。"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "处理 %s (NewPackage)时出错"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "处理 %s (UsePackage1)时出错"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "处理 %s (NewFileDesc1)时出错"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "处理 %s (UsePackage2)时出错"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "处理 %s (NewFileVer1)时出错"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "处理 %s (NewVersion%d)时出错"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "处理 %s (UsePackage3)时出错"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "处理 %s (NewFileDesc2)时出错"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "处理 %s (FindPkg)时出错"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "处理 %s (CollectFileProvides)时出错"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "内部错误，无法定位包内文件"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index dcac41019..d5eb15a2d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.5.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-26 12:05+0200\n"
+"Report-Msgid-Bugs-To: deity@lists.debian.org\n"
+"POT-Creation-Date: 2012-04-11 17:55+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."
@@ -18,151 +18,152 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "套件 %s 版本 %s 未能滿足相依性：\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "套件名稱合計："
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 #, fuzzy
 msgid "Total package structures: "
 msgstr "套件名稱合計："
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  一般套件："
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  完全虛擬套件："
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  單一虛擬套件："
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  混合虛擬套件："
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  找不到："
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "個別版本合計："
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "個別版本類別合計："
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "相依關係合計："
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "版本/檔案關聯合計："
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "類別/檔案關聯合計："
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "提供者對應合計："
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "所有字串合計："
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "相依版本空間合計："
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "間暇空間合計："
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "統計後的空間合計："
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "套件檔 %s 未同步。"
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "未找到套件"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "您必須明確得給定一個樣式"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "找不到套件 %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "套件檔："
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 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:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "鎖定的套件："
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(未找到)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  已安裝："
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  候選："
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(無)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  套件鎖定："
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  版本列表："
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 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:1682
+#: cmdline/apt-cache.cc:1686
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -235,29 +236,29 @@ msgstr ""
 "  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
 "請參閱 apt-cache(8) 及 apt.conf(5) 參考手冊以取得更多資訊。\n"
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 #, 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:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "請把光碟放入光碟機，然後按下 [Enter] 鍵"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "無法將 %s 更名為 %s"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "請對您的光碟組中的其它光碟重複相同的操作。"
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "參數並未成對"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -285,12 +286,12 @@ msgstr ""
 "  -c=? 讀取指定的設定檔\n"
 "  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s 並不是正確的 DEB 套件。"
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -314,40 +315,40 @@ msgstr ""
 "  -c=? 讀取指定的設定檔\n"
 "  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271
 #, c-format
 msgid "Unable to write to %s"
 msgstr "無法寫入 %s"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "無法取得 debconf 版本。是否有安裝 debconf？"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "套件延伸列表過長"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: 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:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "原始碼的延伸列表太長"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "寫入標頭資訊到內容檔時發生錯誤"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "處理內容 %s 時發生錯誤"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -425,26 +426,26 @@ msgstr ""
 "  -c=?  讀取指定的設定檔\n"
 "  -o=?  指定任意的設定選項"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "找不到符合的選項"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "套件檔案組 `%s' 少了部份檔案"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "DB 已損毀，檔案被更名為 %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB 過舊，嘗試升級 %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 #, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
@@ -452,111 +453,111 @@ msgid ""
 msgstr ""
 "資料庫格式不正確。如果您是由舊版的 apt 升級上來的，請移除並重新建立資料庫。"
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "無法開啟 DB 檔 %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
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
 #, c-format
 msgid "Failed to stat %s"
 msgstr "無法取得 %s 的狀態"
 
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "套件檔沒有 control 記錄"
 
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "無法取得遊標"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "警告：無法讀取目錄 %s\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "警告：無法取得 %s 狀態\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "錯誤："
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "警告："
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "錯誤：套用到檔案時發生錯誤"
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "無法解析 %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "無法走訪目錄樹"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "無法開啟 %s"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "無法讀取連結 %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "無法移除連結 %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** 無法將 %s 連結到 %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " 達到了 DeLink 的上限 %sB。\n"
 
-#: ftparchive/writer.cc:398
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "套件檔裡沒有套件資訊"
 
-#: ftparchive/writer.cc:406 ftparchive/writer.cc:703
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s 沒有重新定義項目\n"
 
-#: ftparchive/writer.cc:472 ftparchive/writer.cc:811
+#: 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:713
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s 沒有原始碼重新定義項目\n"
 
-#: ftparchive/writer.cc:717
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s 也沒有二元碼重新定義項目\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - 無法配置記憶體"
 
@@ -566,18 +567,18 @@ msgid "Unable to open %s"
 msgstr "無法開啟 %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
@@ -585,63 +586,51 @@ msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #3"
 msgid "Failed to read the override file %s"
 msgstr "無法讀取重新定義檔 %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "未知的壓縮演算法 '%s'"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "要壓縮輸出 %s 需搭配壓縮動作"
 
-#: ftparchive/multicompress.cc:165 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "無法和子程序建立 IPC 管線"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "無法建立 FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "fork 時失敗"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "壓縮子程序"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "內部錯誤，無法建立 %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "無法建立子程序 IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "無法執行壓縮程式"
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "解壓縮程式"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "和子程序/檔案 IO 失敗"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "在計算 MD5 時無法讀取到資料"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "在取消 %s 的連結時發生問題"
 
-#: ftparchive/multicompress.cc:485 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "無法將 %s 更名為 %s"
@@ -650,75 +639,79 @@ msgstr "無法將 %s 更名為 %s"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "編譯正規表示式時發生錯誤 - %s"
 
-#: cmdline/apt-get.cc:252
+#: cmdline/apt-get.cc:257
 msgid "The following packages have unmet dependencies:"
 msgstr "下列的套件有未滿足的相依關係："
 
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:347
 #, c-format
 msgid "but %s is installed"
 msgstr "但 %s 卻已安裝"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:349
 #, c-format
 msgid "but %s is to be installed"
 msgstr "但 %s 卻將被安裝"
 
-#: cmdline/apt-get.cc:351
+#: cmdline/apt-get.cc:356
 msgid "but it is not installable"
 msgstr "但它卻無法安裝"
 
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:358
 msgid "but it is a virtual package"
 msgstr "但它是虛擬套件"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not installed"
 msgstr "但它卻尚未安裝"
 
-#: cmdline/apt-get.cc:356
+#: cmdline/apt-get.cc:361
 msgid "but it is not going to be installed"
 msgstr "但它卻將不會被安裝"
 
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:366
 msgid " or"
 msgstr "或"
 
-#: cmdline/apt-get.cc:390
+#: cmdline/apt-get.cc:395
 msgid "The following NEW packages will be installed:"
 msgstr "下列【新】套件將會被安裝："
 
-#: cmdline/apt-get.cc:416
+#: cmdline/apt-get.cc:421
 msgid "The following packages will be REMOVED:"
 msgstr "下列套件將會被【移除】："
 
-#: cmdline/apt-get.cc:438
+#: cmdline/apt-get.cc:443
 msgid "The following packages have been kept back:"
 msgstr "下列套件將會維持其原有版本："
 
-#: cmdline/apt-get.cc:459
+#: cmdline/apt-get.cc:464
 msgid "The following packages will be upgraded:"
 msgstr "下列套件將會被升級："
 
-#: cmdline/apt-get.cc:480
+#: cmdline/apt-get.cc:485
 msgid "The following packages will be DOWNGRADED:"
 msgstr "下列套件將會被【降級】："
 
-#: cmdline/apt-get.cc:500
+#: cmdline/apt-get.cc:505
 msgid "The following held packages will be changed:"
 msgstr "下列被保留 (hold) 的套件將會被更改："
 
-#: cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:560
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s（因為 %s）"
 
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:568
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -726,60 +719,60 @@ msgstr ""
 "【警告】：下列的基本套件都將被移除。\n"
 "除非您很清楚您在做什麼，否則請勿輕易嘗試！"
 
-#: cmdline/apt-get.cc:594
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "升級 %lu 個，新安裝 %lu 個，"
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "重新安裝 %lu 個，"
 
-#: cmdline/apt-get.cc:600
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu downgraded, "
 msgstr "降級 %lu 個，"
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "移除 %lu 個，有 %lu 個未被升級。\n"
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu 個沒有完整得安裝或移除。\n"
 
-#: cmdline/apt-get.cc:628
+#: cmdline/apt-get.cc:632
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "注意，根據正規表示式 '%2$s' 而選擇了 %1$s\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:637
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "注意，根據正規表示式 '%2$s' 而選擇了 %1$s\n"
 
-#: cmdline/apt-get.cc:651
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "套件 %s 是虛擬套件，提供者為：\n"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr "【已安裝】"
 
-#: cmdline/apt-get.cc:671
+#: cmdline/apt-get.cc:674
 #, fuzzy
 msgid " [Not candidate version]"
 msgstr "候選版本"
 
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "請您明確地選擇一個來進行安裝。"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -789,177 +782,177 @@ msgstr ""
 "無法取得套件 %s，但它卻被其它的套件引用了。\n"
 "這意味著這個套件可能已經消失了、被廢棄了，或是只能由其他的來源取得\n"
 
-#: cmdline/apt-get.cc:694
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "然而，下列的套件取代了它："
 
-#: cmdline/apt-get.cc:706
+#: cmdline/apt-get.cc:709
 #, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "套件 %s 沒有可安裝的候選版本"
 
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:748
+#: cmdline/apt-get.cc:764
 #, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "注意，選擇了以 %s 替代 %s\n"
 
-#: cmdline/apt-get.cc:778
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:798
 #, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n"
 
-#: cmdline/apt-get.cc:794
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "無法重新安裝 %s，因為它無法下載。\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s 已經是最新版本了。\n"
 
-#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 被設定為手動安裝。\n"
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:860
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:865
 #, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
 
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n"
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "正在修正相依關係..."
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " 失敗。"
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "無法修正相依關係"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "無法將升級計劃最小化"
 
-#: cmdline/apt-get.cc:982
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " 完成"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "您也許得執行 'apt-get -f install' 以修正這些問題。"
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "未能滿足相依關係。試試 -f 選項。"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "【警告】：無法驗證下列套件！"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "忽略了驗證警告。\n"
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "是否不經驗證就安裝這些套件？[y/N]"
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "有部份套件無法驗證"
 
-#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "發生了問題，且 -y 並沒有和 --force-yes 搭配使用"
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "內部錯誤，在損毀的套件上執行 InstallPackages！"
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "有套件需要被移除，但卻被禁止移除。"
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "內部錯誤，排序未能完成"
 
-#: cmdline/apt-get.cc:1135
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr "怪哉... 檔案大小不符，請發信給 apt@packages.debian.org"
 
 #. 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:1142
+#: cmdline/apt-get.cc:1156
 #, 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:1147
+#: cmdline/apt-get.cc:1161
 #, 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:1154
+#: cmdline/apt-get.cc:1168
 #, 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:1159
+#: cmdline/apt-get.cc:1173
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "此操作完成之後，會空出 %sB 的磁碟空間。\n"
 
-#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499
-#: cmdline/apt-get.cc:2502
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "無法確認 %s 的未使用空間"
 
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "在 %s 裡沒有足夠的的未使用空間。"
 
-#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "雖然指定了 Trivial Only（自動答 NO）選項，但這並不是 trivial 操作。"
 
-#: cmdline/apt-get.cc:1205
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: cmdline/apt-get.cc:1207
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -970,28 +963,28 @@ msgstr ""
 "請輸入 '%s' 這個句子以繼續進行\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "放棄執行。"
 
-#: cmdline/apt-get.cc:1228
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "是否繼續進行 [Y/n]？"
 
-#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "無法取得 %s，%s\n"
 
-#: cmdline/apt-get.cc:1318
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "有部份檔案無法下載"
 
-#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "下載完成，且這是『僅下載』模式"
 
-#: cmdline/apt-get.cc:1325
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -999,19 +992,19 @@ msgstr ""
 "有部份套件檔無法取得，試著執行 apt-get update 或者試著加上 --fix-missing 選"
 "項？"
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "目前尚未支援 --fix-missing 和媒體抽換"
 
-#: cmdline/apt-get.cc:1334
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "無法修正欠缺的套件。"
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "放棄安裝。"
 
-#: cmdline/apt-get.cc:1363
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1021,35 +1014,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1367
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1551
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "無法取得來源套件列表 %s 的狀態"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1575
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1591
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "update 指令不需任何參數"
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "我們沒有計劃要刪除任何東西，無法啟動 AutoRemover"
 
-#: cmdline/apt-get.cc:1748
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1067,15 +1060,15 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "以下的資訊或許有助於解決當前的情況："
 
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "內部錯誤，AutoRemover 處理失敗"
 
-#: cmdline/apt-get.cc:1762
+#: cmdline/apt-get.cc:1786
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1085,7 +1078,7 @@ msgid_plural ""
 msgstr[0] "以下套件是被自動安裝進來的，且已不再會被用到了："
 msgstr[1] "以下套件是被自動安裝進來的，且已不再會被用到了："
 
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1790
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1093,19 +1086,19 @@ msgid_plural ""
 msgstr[0] "以下套件是被自動安裝進來的，且已不再會被用到了："
 msgstr[1] "以下套件是被自動安裝進來的，且已不再會被用到了："
 
-#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "使用 'apt-get autoremove' 來將其移除。"
 
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "內部錯誤，AllUpgrade 造成了損壞"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "您也許得執行 'apt-get -f install' 以修正這些問題："
 
-#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1113,7 +1106,7 @@ msgstr ""
 "未能滿足相依關係。請試著不指定套件來執行 'apt-get -f install'（或採取其它的解"
 "決方案）。"
 
-#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:1929
 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"
@@ -1123,80 +1116,80 @@ msgstr ""
 "有些套件無法安裝。這可能意謂著您的要求難以解決，或是若您使用的是\n"
 "unstable 發行版，可能有些必要的套件尚未建立，或是被移出 Incoming 了。"
 
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "損毀的套件"
 
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "下列的額外套件將被安裝："
 
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "建議套件："
 
-#: cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "推薦套件："
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "無法找到套件 %s"
 
-#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s 被設定為手動安裝。\n"
 
-#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "籌備升級中... "
 
-#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
 msgstr "失敗"
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "完成"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "內部錯誤，問題排除器造成了損壞"
 
-#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "無法鎖定下載目錄"
 
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr "在取得原始碼時必須至少指定一個套件"
 
-#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "無法找到 %s 的原始碼套件"
 
-#: cmdline/apt-get.cc:2418
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1204,104 +1197,104 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "略過已下載的檔案 '%s'\n"
 
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2548
 #, 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:2522
+#: cmdline/apt-get.cc:2557
 #, 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:2527
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下載 %sB 的原始套件檔。\n"
 
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "取得原始碼 %s\n"
 
-#: cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "無法取得某些套件檔。"
 
-#: cmdline/apt-get.cc:2602
+#: cmdline/apt-get.cc:2637
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "不解開，因原始碼已解開至 %s\n"
 
-#: cmdline/apt-get.cc:2614
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "解開指令 '%s' 失敗。\n"
 
-#: cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
 
-#: cmdline/apt-get.cc:2637
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "編譯指令 '%s' 失敗。\n"
 
-#: cmdline/apt-get.cc:2657
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "子程序失敗"
 
-#: cmdline/apt-get.cc:2676
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr "在檢查編譯相依關係時必須至少指定一個套件"
 
-#: cmdline/apt-get.cc:2701
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2718
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "無法取得 %s 的編譯相依關係資訊"
 
-#: cmdline/apt-get.cc:2738
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 沒有編譯相依關係。\n"
 
-#: cmdline/apt-get.cc:2868
+#: cmdline/apt-get.cc:2903
 #, 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:2889
+#: cmdline/apt-get.cc:2924
 #, 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:2912
+#: cmdline/apt-get.cc:2947
 #, 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:2951
+#: cmdline/apt-get.cc:2986
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1309,37 +1302,37 @@ msgid ""
 msgstr ""
 "無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求"
 
-#: cmdline/apt-get.cc:2957
+#: cmdline/apt-get.cc:2992
 #, 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:2980
+#: cmdline/apt-get.cc:3015
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "無法滿足 %2$s 的相依關係 %1$s：%3$s"
 
-#: cmdline/apt-get.cc:2996
+#: cmdline/apt-get.cc:3031
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "無法滿足套件 %s 的編譯相依關係。"
 
-#: cmdline/apt-get.cc:3001
+#: cmdline/apt-get.cc:3036
 msgid "Failed to process build dependencies"
 msgstr "無法處理編譯相依關係"
 
-#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "正和 %s (%s) 連線"
 
-#: cmdline/apt-get.cc:3225
+#: cmdline/apt-get.cc:3260
 msgid "Supported modules:"
 msgstr "已支援模組："
 
-#: cmdline/apt-get.cc:3266
+#: cmdline/apt-get.cc:3301
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1425,7 +1418,7 @@ msgstr ""
 "以取得更多資訊和選項。\n"
 "                        該 APT 有著超級牛力。\n"
 
-#: cmdline/apt-get.cc:3429
+#: cmdline/apt-get.cc:3466
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1433,33 +1426,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "已有 "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "下載:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "略過 "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "錯誤 "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "取得 %sB 用了 %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [工作中]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1470,46 +1463,62 @@ msgstr ""
 " '%s'\n"
 "放入 '%s' 裝置，然後按 [Enter] 鍵\n"
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver 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"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:49
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "但它卻尚未安裝"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s 被設定為手動安裝。\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s 被設定為手動安裝。\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s 已經是最新版本了。\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s 已經是最新版本了。\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s 被設定為手動安裝。\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "無法開啟 %s"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1531,11 +1540,11 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "未知的套件記錄！"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1594,196 +1603,198 @@ msgstr "以上的訊息相當重要。請修正它們並重新執行安裝[I]"
 msgid "Merging available information"
 msgstr "整合現有的資料"
 
-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
 msgstr "無法建立管線"
 
-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
 msgstr "無法執行 gzip"
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "損毀的套件檔"
 
-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar checksum 失敗，套件檔已損毀"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "未知的 TAR 標頭類型 %u，成員 %s"
 
-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
 msgstr "無效的套件庫簽章"
 
-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "讀取套件檔的成員標頭訊息時發生錯誤"
 
-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94
 #, fuzzy, c-format
 msgid "Invalid archive member header %s"
 msgstr "無效的套件檔成員標頭"
 
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
 msgstr "無效的套件檔成員標頭"
 
-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
 msgstr "套件檔過短"
 
-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
 msgstr "讀取套件檔標頭失敗"
 
-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
 msgstr "DropNode 在還有連結結點時被呼叫"
 
-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
 msgstr "找不到雜湊元件！"
 
-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
 msgstr "在配置抽換資訊時失敗"
 
-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "在 AddDiversion 發生了內部錯誤"
 
-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "試圖改寫抽換資訊，%s -> %s 和 %s/%s"
 
-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "重複加入抽換資訊 %s -> %s"
 
-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "重複的設定檔 %s/%s"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:50
 #, c-format
 msgid "Failed to write file %s"
 msgstr "寫入檔案 %s 失敗"
 
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "關閉檔案 %s 失敗"
 
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "路徑 %s 過長"
 
-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "解開 %s 超過一次"
 
-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "路徑 %s 已被抽換"
 
-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "此套件試圖寫至抽換後的目標 %s/%s"
 
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "要進行抽換的路徑過長"
 
-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "目錄 %s 已經被非目錄的檔案所取代"
 
-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
 msgstr "在雜湊表中找不到節點"
 
-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287
 msgid "The path is too long"
 msgstr "路徑過長"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "以無版本的 %s 覆寫原始套件"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "檔案 %s/%s 覆寫了套件 %s 中的相同檔案"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104
-#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352
-#: methods/mirror.cc:91
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
 #, c-format
 msgid "Unable to read %s"
 msgstr "無法讀取 %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
 msgstr "無法取得 %s 的狀態"
 
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "無法移除 %s"
 
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "無法建立 %s"
 
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "無法取得 %sinfo 的狀態"
 
-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "資料目錄與暫存目錄需位於同一檔案系統中"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048
-#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158
-#: apt-pkg/pkgcachegen.cc:1320
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436
 msgid "Reading package lists"
 msgstr "正在讀取套件清單"
 
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "無法切換至管理者目錄 %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
 msgstr "內部錯誤，無法取得套件名稱"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "正在讀取檔案清單"
 
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1793,473 +1804,479 @@ msgstr ""
 "無法開啟清單檔 %sinfo/%s。如果您無法將此檔案還原，請清除檔案內容，然後立即重"
 "新安裝同一版本的套件！"
 
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "無法讀取清單檔 %sinfo/%s"
 
-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
 msgstr "內部錯誤，無法取得節點"
 
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "讀取抽換檔 %sdiversions 失敗"
 
-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324
 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
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "在抽換檔中的這一行有誤：%s"
 
-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
 msgstr "內部錯誤：在新增抽換資料時發生錯誤"
 
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
 msgstr "套件快取必須先初始化"
 
-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "找不到套件：檔案標頭，位移 %lu"
 
-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "在 status 檔中的 ConfFile 區段損壞。位移 %lu"
 
-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "在解析 MD5 時發生錯誤。位移 %lu"
 
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "這是個不正確的 DEB 套件檔，沒有 '%s' 成員"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
+#: apt-inst/deb/debfile.cc:56 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 "這是個不正確的 DEB 套件檔，沒有 '%s', '%s' 或 '%s' 成員"
 
-#: apt-inst/deb/debfile.cc:113
+#: apt-inst/deb/debfile.cc:116
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "無法切換至 %s"
 
-#: apt-inst/deb/debfile.cc:154
+#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "內部錯誤，找不找到成員 %s"
 
-#: apt-inst/deb/debfile.cc:189
+#: apt-inst/deb/debfile.cc:192
 msgid "Failed to locate a valid control file"
 msgstr "找不到可用的 control 檔"
 
-#: apt-inst/deb/debfile.cc:274
+#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
 msgstr "無法分析的 control 檔"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
+#: methods/bzip2.cc:63 methods/gzip.cc:54
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:67
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "無法開啟管線給 %s 使用"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:111
 #, c-format
 msgid "Read error from %s process"
 msgstr "由 %s 程序讀取錯誤"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493
+#: methods/rred.cc:502
 msgid "Failed to stat"
 msgstr "無法取得狀態"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:499
 msgid "Failed to set modification time"
 msgstr "無法設定修改時間"
 
-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "無法讀取光碟片資料庫 %s"
 
-#: methods/cdrom.cc:208
+#: 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 ""
 "請用 apt-cdrom 來讓 APT 能辨識這張光碟。apt-get update 是不能用來新增光碟的"
 
-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "不正確的光碟"
 
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "無法卸載 %s 裡的光碟片，或許它仍在使用中。"
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "找不到磁碟。"
 
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
 msgid "File not found"
 msgstr "找不到檔案"
 
-#: methods/file.cc:44
+#: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "不正確的 URI，本機 URI 不應以 // 開頭"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "登入中"
 
-#: methods/ftp.cc:174
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "無法解析對方主機名稱"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "無法解析本機名稱"
 
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "伺服器不接受連線，並回應：%s"
 
-#: methods/ftp.cc:216
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER 指令失敗，伺服器回應：%s"
 
-#: methods/ftp.cc:223
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS 指令失敗，伺服器回應：%s"
 
-#: methods/ftp.cc:243
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 "指定了代理伺服器，但沒有指定登入 script，Acquire::ftp::ProxyLogin 是空的。"
 
-#: methods/ftp.cc:271
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "登入 script 指令 '%s' 失敗，伺服器回應：%s"
 
-#: methods/ftp.cc:297
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE 指令失敗，伺服器回應：%s"
 
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
 msgid "Connection timeout"
 msgstr "連線逾時"
 
-#: methods/ftp.cc:341
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "伺服器已關閉連線"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: methods/ftp.cc:351 methods/rsh.cc:198
+#: methods/ftp.cc:355 methods/rsh.cc:204
 msgid "A response overflowed the buffer."
 msgstr "回應超過緩衝區長度。"
 
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "協定失敗"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239
 msgid "Write error"
 msgstr "寫入錯誤"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
 msgid "Could not create a socket"
 msgstr "無法建立 Socket"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr "無法和 data socket 連線，連線逾時"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "無法和 passive socket 連線。"
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:731
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo 無法取得監聽 socket"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:745
 msgid "Could not bind a socket"
 msgstr "無法 bind 至 socket"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not listen on the socket"
 msgstr "無法監聽 socket"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:756
 msgid "Could not determine the socket's name"
 msgstr "無法解析 socket 名稱"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:788
 msgid "Unable to send PORT command"
 msgstr "無法送出 PORT 指令"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:798
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "未知的地址家族 %u (AF_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:807
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT 指令失敗，伺服器回應：%s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:827
 msgid "Data socket connect timed out"
 msgstr "Data socket 連線逾時"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:834
 msgid "Unable to accept connection"
 msgstr "無法接受連線"
 
-#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309
 msgid "Problem hashing file"
 msgstr "有問題的雜湊檔"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:886
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "無法取得檔案，伺服器回應 '%s'"
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328
 msgid "Data socket timed out"
 msgstr "Data socket 連線逾時"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:931
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "資料傳輸失敗，伺服器回應 '%s'"
 
 #. Get the files information
-#: methods/ftp.cc:1004
+#: methods/ftp.cc:1008
 msgid "Query"
 msgstr "查詢"
 
-#: methods/ftp.cc:1116
+#: methods/ftp.cc:1120
 msgid "Unable to invoke "
 msgstr "無法 invoke "
 
-#: methods/connect.cc:71
+#: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "正和 %s (%s) 連線"
 
-#: methods/connect.cc:82
+#: methods/connect.cc:86
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-#: methods/connect.cc:89
+#: methods/connect.cc:93
 #, 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:95
+#: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "無法初始和 %s:%s (%s) 的連線。"
 
-#: methods/connect.cc:103
+#: methods/connect.cc:107
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "無法和 %s:%s (%s) 連線，連線逾時"
 
-#: methods/connect.cc:121
+#: methods/connect.cc:125
 #, 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:149 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431
 #, c-format
 msgid "Connecting to %s"
 msgstr "正連線至 %s"
 
-#: methods/connect.cc:168 methods/connect.cc:187
+#: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "無法解析 '%s'"
 
-#: methods/connect.cc:193
+#: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "暫時無法解析 '%s'"
 
-#: methods/connect.cc:196
+#: methods/connect.cc:200
 #, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "在解析 '%s:%s' (%i) 時出了怪事"
 
-#: methods/connect.cc:243
+#: methods/connect.cc:247
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "無法連線至 %s %s："
 
-#: methods/gpgv.cc:166
+#: methods/gpgv.cc:172
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "內部錯誤：簽章無誤，但卻無法辨識密鑰的指紋碼？！"
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:177
 msgid "At least one invalid signature was encountered."
 msgstr "至少發現一個無效的簽章。"
 
-#: methods/gpgv.cc:175
+#: methods/gpgv.cc:181
 #, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr "無法執行 '%s' 來驗證簽章（gpgv 是否安裝了？）"
 
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:186
 msgid "Unknown error executing gpgv"
 msgstr "在執行 gpgv 時發生未知的錯誤"
 
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
 msgid "The following signatures were invalid:\n"
 msgstr "以下簽名無效：\n"
 
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:234
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr "由於無法取得它們的公鑰，以下簽章無法進行驗證：\n"
 
-#: methods/http.cc:385
+#: methods/http.cc:393
 msgid "Waiting for headers"
 msgstr "等待標頭"
 
-#: methods/http.cc:531
+#: methods/http.cc:539
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "取得一個單行超過 %u 字元的標頭"
 
-#: methods/http.cc:539
+#: methods/http.cc:547
 msgid "Bad header line"
 msgstr "標頭行錯誤"
 
-#: methods/http.cc:564 methods/http.cc:571
+#: methods/http.cc:572 methods/http.cc:579
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP 伺服器傳送了一個無效的回覆標頭"
 
-#: methods/http.cc:600
+#: methods/http.cc:608
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP 伺服器傳送了一個無效的 Content-Length 標頭"
 
-#: methods/http.cc:615
+#: methods/http.cc:623
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP 伺服器傳送了一個無效的 Content-Range 標頭"
 
-#: methods/http.cc:617
+#: methods/http.cc:625
 msgid "This HTTP server has broken range support"
 msgstr "這個 HTTP 伺服器的範圍支援有問題"
 
-#: methods/http.cc:641
+#: methods/http.cc:649
 msgid "Unknown date format"
 msgstr "未知的資料格式"
 
-#: methods/http.cc:800
+#: methods/http.cc:808
 msgid "Select failed"
 msgstr "選擇失敗"
 
-#: methods/http.cc:805
+#: methods/http.cc:813
 msgid "Connection timed out"
 msgstr "連線逾時"
 
-#: methods/http.cc:828
+#: methods/http.cc:836
 msgid "Error writing to output file"
 msgstr "在寫入輸出檔時發生錯誤"
 
-#: methods/http.cc:859
+#: methods/http.cc:867
 msgid "Error writing to file"
 msgstr "在寫入檔案時發生錯誤"
 
-#: methods/http.cc:887
+#: methods/http.cc:895
 msgid "Error writing to the file"
 msgstr "在寫入該檔時發生錯誤"
 
-#: methods/http.cc:901
+#: methods/http.cc:909
 msgid "Error reading from server. Remote end closed connection"
 msgstr "在讀取伺服器時發生錯誤，遠端主機已關閉連線"
 
-#: methods/http.cc:903
+#: methods/http.cc:911
 msgid "Error reading from server"
 msgstr "在讀取伺服器時發生錯誤"
 
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "無法截短檔案"
-
-#: methods/http.cc:1183
+#: methods/http.cc:1181
 msgid "Bad header data"
 msgstr "錯誤的標頭資料"
 
-#: methods/http.cc:1200 methods/http.cc:1255
+#: methods/http.cc:1198 methods/http.cc:1253
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: methods/http.cc:1347
+#: methods/http.cc:1345
 msgid "Internal error"
 msgstr "內部錯誤"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "不能 mmap 空白檔案"
 
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "無法開啟管線給 %s 使用"
 
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:117
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr "無法 mmap 到 %lu 位元組"
 
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144
 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "無法開啟 %s"
 
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "無法 invoke "
 
-#: apt-pkg/contrib/mmap.cc:310
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "無法 mmap 到 %lu 位元組"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "無法截短檔案"
+
+#: apt-pkg/contrib/mmap.cc:330
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2268,14 +2285,14 @@ msgstr ""
 "動態 MMap 已用完所有空間。請增加 APT::Cache-Limit 的大小。目前大小為：%lu。"
 "(man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:409
+#: apt-pkg/contrib/mmap.cc:429
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:412
+#: apt-pkg/contrib/mmap.cc:432
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2304,93 +2321,93 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1138
+#: apt-pkg/contrib/strutl.cc:1165
 #, c-format
 msgid "Selection %s not found"
 msgstr "選項 %s 找不到"
 
-#: apt-pkg/contrib/configuration.cc:465
+#: apt-pkg/contrib/configuration.cc:468
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "無法辨識的縮寫類型：'%c'"
 
-#: apt-pkg/contrib/configuration.cc:523
+#: apt-pkg/contrib/configuration.cc:526
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "開啟設定檔 %s"
 
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:694
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "語法錯誤 %s:%u：區塊開頭沒有名稱。"
 
-#: apt-pkg/contrib/configuration.cc:710
+#: apt-pkg/contrib/configuration.cc:713
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "語法錯誤 %s:%u：標籤格式錯誤"
 
-#: apt-pkg/contrib/configuration.cc:727
+#: apt-pkg/contrib/configuration.cc:730
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "語法錯誤 %s:%u：數值後有多餘的垃圾"
 
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "語法錯誤 %s:%u：指令只能於最高層級執行"
 
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:777
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "語法錯誤 %s:%u: 太多巢狀引入檔"
 
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "語法錯誤 %s:%u：從此引入"
 
-#: apt-pkg/contrib/configuration.cc:787
+#: apt-pkg/contrib/configuration.cc:790
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "語法錯誤 %s:%u：不支援的指令 '%s'"
 
-#: apt-pkg/contrib/configuration.cc:790
+#: apt-pkg/contrib/configuration.cc:793
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr "語法錯誤 %s:%u：指令只能於最高層級執行"
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:843
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "語法錯誤 %s:%u：在檔案結尾有多餘的垃圾"
 
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... 錯誤！"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... 完成"
 
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "未知的命令列選項 '%c' [來自 %s]。"
 
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "無法理解的命令列選項 %s"
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "命令列選項 %s 不是 boolean 值"
 
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "需替選項 %s 指定參數。"
@@ -2400,343 +2417,361 @@ msgstr "需替選項 %s 指定參數。"
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "選項 %s：在指定設定項目時應該有 =<val>。"
 
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "選項 %s 的參數應該是數字，而不是 '%s'"
 
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "選項 %s 太長"
 
-#: 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 "偵測器 %s 無法理解，試試 true 或 false。"
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
 msgid "Invalid operation %s"
 msgstr "無效的操作 %s"
 
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "無法取得掛載點 %s 的狀態"
 
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:97
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
 #, c-format
 msgid "Unable to change to %s"
 msgstr "無法切換至 %s"
 
-#: apt-pkg/contrib/cdromutl.cc:220
+#: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr "無法取得 CD-ROM 的狀態"
 
-#: apt-pkg/contrib/fileutl.cc:168
+#: apt-pkg/contrib/fileutl.cc:197
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "不在唯讀檔案 %s 上使用檔案鎖定"
 
-#: apt-pkg/contrib/fileutl.cc:173
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "無法開啟鎖定檔 %s"
 
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:220
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "不在以 nfs 掛載的檔案 %s 上使用檔案鎖定"
 
-#: apt-pkg/contrib/fileutl.cc:195
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Could not get lock %s"
 msgstr "無法將 %s 鎖定"
 
-#: apt-pkg/contrib/fileutl.cc:335
+#: apt-pkg/contrib/fileutl.cc:364
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:362
+#: apt-pkg/contrib/fileutl.cc:391
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:409
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:389
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:679
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "等待 %s 但是它並不存在"
 
-#: apt-pkg/contrib/fileutl.cc:691
+#: apt-pkg/contrib/fileutl.cc:731
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "子程序 %s 收到一個記憶體錯誤。"
 
-#: apt-pkg/contrib/fileutl.cc:693
+#: apt-pkg/contrib/fileutl.cc:733
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "子程序 %s 收到一個記憶體錯誤。"
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:737
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "子程序 %s 傳回錯誤碼 (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:699
+#: apt-pkg/contrib/fileutl.cc:739
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "子程序 %s 不預期得結束"
 
-#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655
 #, c-format
 msgid "Could not open file %s"
 msgstr "無法開啟檔案 %s"
 
-#: apt-pkg/contrib/fileutl.cc:781
+#: apt-pkg/contrib/fileutl.cc:923
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "無法開啟管線給 %s 使用"
 
-#: apt-pkg/contrib/fileutl.cc:841
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr "無法建立子程序 IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr "無法執行壓縮程式"
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
 msgstr "讀取，仍有 %lu 未讀但已無空間"
 
-#: apt-pkg/contrib/fileutl.cc:874
-#, c-format
-msgid "write, still have %lu to write but couldn't"
+#: apt-pkg/contrib/fileutl.cc:1152
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
 msgstr "寫入，仍有 %lu 待寫入但已沒辨法"
 
-#: apt-pkg/contrib/fileutl.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1410
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "在關閉檔案時發生問題"
 
-#: apt-pkg/contrib/fileutl.cc:1013
+#: apt-pkg/contrib/fileutl.cc:1414
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "在關閉檔案時發生問題"
 
-#: apt-pkg/contrib/fileutl.cc:1018
+#: apt-pkg/contrib/fileutl.cc:1419
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "在同步檔案時發生問題"
 
-#: apt-pkg/contrib/fileutl.cc:1029
+#: apt-pkg/contrib/fileutl.cc:1430
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "在刪除檔案時發生問題"
 
-#: apt-pkg/contrib/fileutl.cc:1042
+#: apt-pkg/contrib/fileutl.cc:1450
 msgid "Problem syncing the file"
 msgstr "在同步檔案時發生問題"
 
-#: apt-pkg/pkgcache.cc:145
+#: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
 msgstr "清空套件快取"
 
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
 msgstr "套件快取檔損壞"
 
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "套件快取檔版本不符"
 
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "套件快取檔損壞"
+
+#: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "本 APT 不支援 '%s' 版本系統"
 
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
 msgstr "這個套件快取是用於另一種平台的"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Depends"
 msgstr "相依關係"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
 msgstr "預先相依關係"
 
-#: apt-pkg/pkgcache.cc:299
+#: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
 msgstr "建議"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
 msgstr "推薦"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
 msgstr "衝突"
 
-#: apt-pkg/pkgcache.cc:300
+#: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
 msgstr "取代"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
 msgstr "廢棄"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
 msgstr "毀損"
 
-#: apt-pkg/pkgcache.cc:301
+#: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "important"
 msgstr "重要"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "required"
 msgstr "必要"
 
-#: apt-pkg/pkgcache.cc:312
+#: apt-pkg/pkgcache.cc:318
 msgid "standard"
 msgstr "標準"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "optional"
 msgstr "次要"
 
-#: apt-pkg/pkgcache.cc:313
+#: apt-pkg/pkgcache.cc:319
 msgid "extra"
 msgstr "額外"
 
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
 msgstr "正在重建相依關係"
 
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
 msgstr "候選版本"
 
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
 msgstr "建立相依關係"
 
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
 msgstr "正在讀取狀態資料"
 
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "無法開啟 StateFile %s"
 
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "無法寫入暫存的 StateFile %s"
 
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "無法辨識套件檔 %s (1)"
 
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "無法辨識套件檔 %s (2)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:96
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
 
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:99
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）"
 
-#: apt-pkg/sourcelist.cc:106
+#: apt-pkg/sourcelist.cc:110
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
 
-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/sourcelist.cc:116
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
 
-#: apt-pkg/sourcelist.cc:115
+#: apt-pkg/sourcelist.cc:119
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
 
-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤 (URI)"
 
-#: apt-pkg/sourcelist.cc:130
+#: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）"
 
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）"
 
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（絕對發行版）"
 
-#: apt-pkg/sourcelist.cc:146
+#: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
 
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
 msgstr "正在開啟 %s"
 
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "來源列表 %2$s 中的第 %1$u 行太長。"
 
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（類型）"
 
-#: apt-pkg/sourcelist.cc:285
+#: apt-pkg/sourcelist.cc:289
 #, 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:335 apt-pkg/packagemanager.cc:623
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
 #, 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:456
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "無法開啟檔案 %s"
+
+#: apt-pkg/packagemanager.cc:507
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2746,25 +2781,18 @@ msgstr ""
 "此安裝因衝突或預先相依關係，需暫時刪除 %s 這個基本套件。這通常不是好主意，但"
 "若您執意進行，請設定 APT::Force-LoopBreak 選項。"
 
-#: apt-pkg/packagemanager.cc:501
-#, 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
+#: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "不被支援的索引檔類型 '%s'"
 
-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:255
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "套件 %s 需要重新安裝，但找不到它的套件檔。"
 
-#: apt-pkg/algorithms.cc:1158
+#: apt-pkg/algorithms.cc:1191
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2772,242 +2800,204 @@ msgstr ""
 "錯誤，pkgProblemResolver::Resolve 的建立中斷了，這可能肇因於保留 (hold) 套"
 "件。"
 
-#: apt-pkg/algorithms.cc:1160
+#: apt-pkg/algorithms.cc:1193
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "無法修正問題，您保留 (hold) 了損毀的套件。"
 
-#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
 #, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr "有一些索引檔不能下載，它們可能被略過了，或是替而使用原有的索引檔。"
 
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/acquire.cc:81
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "找不到清單目錄 %spartial。"
 
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
 #, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "找不到套件檔目錄 %spartial。"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "無法鎖定列表目錄"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:864
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "正在取得檔案 %li/%li（還有 %s）"
 
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:866
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "正在取得檔案 %li/%li"
 
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "找不到安裝方式的驅動程式 %s。"
 
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "安裝方式 %s 沒有正確啟動"
 
-#: apt-pkg/acquire-worker.cc:423
+#: apt-pkg/acquire-worker.cc:425
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中，然後按下 [Enter] 鍵。"
 
-#: apt-pkg/init.cc:147
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "不支援的套件包裝系統 '%s'"
 
-#: apt-pkg/init.cc:163
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr "無法確認合適的套件包裝系統類型"
 
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59
 #, c-format
 msgid "Unable to stat %s."
 msgstr "無法取得 %s 的狀態。"
 
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "在 sources.list 中必須包含一些 'source' URI"
 
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "無法分析或開啟套件清單或狀況檔。"
 
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "您也許得執行 apt-get update 以修正這些問題"
 
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
 msgstr "無法讀取來源列表。"
 
-#: apt-pkg/policy.cc:71
+#: apt-pkg/policy.cc:74
 #, 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:389
+#: apt-pkg/policy.cc:396
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "個人設定檔中有些不正確資料，沒有以 Package 開頭"
 
-#: apt-pkg/policy.cc:411
+#: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "無法分析鎖定類型 %s"
 
-#: apt-pkg/policy.cc:419
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "銷定並沒有優先順序之分（或零）"
 
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
 msgstr "快取使用的是不相容的版本系統"
 
-#: apt-pkg/pkgcachegen.cc:187
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "在處理 %s 時發生錯誤 (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:204
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "在處理 %s 時發生錯誤 (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:242
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "在處理 %s 時發生錯誤 (NewFileDesc1)"
-
-#: apt-pkg/pkgcachegen.cc:274
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "在處理 %s 時發生錯誤 (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:278
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "在處理 %s 時發生錯誤 (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305
-#: apt-pkg/pkgcachegen.cc:313
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
 #, fuzzy, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "在處理 %s 時發生錯誤 (NewVersion1)"
-
-#: apt-pkg/pkgcachegen.cc:309
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "在處理 %s 時發生錯誤 (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:342
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "在處理 %s 時發生錯誤 (NewFileDesc2)"
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "在處理 %s 時發生錯誤 (FindPkg)"
 
-#: apt-pkg/pkgcachegen.cc:348
+#: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "哇呀，您已經超過這個 APT 所能處理的套件名稱數量了。"
 
-#: apt-pkg/pkgcachegen.cc:351
+#: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "哇呀，您已經超過這個 APT 所能處理的版本數量了。"
 
-#: apt-pkg/pkgcachegen.cc:354
+#: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "哇呀，您已經超過這個 APT 所能處理的說明數量了。"
 
-#: apt-pkg/pkgcachegen.cc:357
+#: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "哇呀，您已經超過這個 APT 所能處理的相依關係數量了。"
 
-#: apt-pkg/pkgcachegen.cc:386
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "在處理 %s 時發生錯誤 (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:400
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "在處理 %s 時發生錯誤 (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:406
+#: apt-pkg/pkgcachegen.cc:517
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "在計算檔案相依性時找不到套件 %s %s"
 
-#: apt-pkg/pkgcachegen.cc:960
+#: apt-pkg/pkgcachegen.cc:1082
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "無法取得來源套件列表 %s 的狀態"
 
-#: apt-pkg/pkgcachegen.cc:1065
+#: apt-pkg/pkgcachegen.cc:1187
 msgid "Collecting File Provides"
 msgstr "正在收集檔案提供者"
 
-#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
 msgid "IO Error saving source cache"
 msgstr "在儲存來源快取時 IO 錯誤"
 
-#: apt-pkg/acquire-item.cc:135
+#: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "無法重新命名，%s (%s -> %s)。"
 
-#: apt-pkg/acquire-item.cc:636
+#: apt-pkg/acquire-item.cc:640
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum 不符"
 
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848
-#: apt-pkg/acquire-item.cc:1991
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
 msgid "Hash Sum mismatch"
 msgstr "Hash Sum 不符"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:1399
 #, 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:1403
+#: apt-pkg/acquire-item.cc:1415
 #, 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:1450
 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:1488
 #, 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:1510
 #, 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:1543
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3015,12 +3005,12 @@ msgid ""
 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:1553 apt-pkg/acquire-item.cc:1558
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1639
+#: apt-pkg/acquire-item.cc:1650
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3029,54 +3019,54 @@ msgstr ""
 "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。（因為找不到平"
 "台）"
 
-#: apt-pkg/acquire-item.cc:1698
+#: apt-pkg/acquire-item.cc:1709
 #, 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:1753
+#: apt-pkg/acquire-item.cc:1768
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。"
 
-#: apt-pkg/acquire-item.cc:1840
+#: apt-pkg/acquire-item.cc:1855
 msgid "Size mismatch"
 msgstr "大小不符"
 
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:61
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "無法辨別 Release 檔 %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:71
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "在 Release 檔 %s 裡沒有區段"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:105
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:118
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:137
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
 
-#: apt-pkg/vendorlist.cc:71
+#: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "提供者區塊 %s 沒有包含指紋碼"
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:566
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
@@ -3085,63 +3075,63 @@ msgstr ""
 "使用光碟機掛載點 %s\n"
 "正在掛載光碟機\n"
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
 msgid "Identifying.. "
 msgstr "正在識別.."
 
-#: apt-pkg/cdrom.cc:562
+#: apt-pkg/cdrom.cc:603
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "保存標籤：%s\n"
 
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
 msgid "Unmounting CD-ROM...\n"
 msgstr "正在卸載光碟機...\n"
 
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:632
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "使用光碟機掛載點 %s\n"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:650
 msgid "Unmounting CD-ROM\n"
 msgstr "正在卸載光碟機\n"
 
-#: apt-pkg/cdrom.cc:614
+#: apt-pkg/cdrom.cc:655
 msgid "Waiting for disc...\n"
 msgstr "正在等待碟片...\n"
 
-#: apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:664
 msgid "Mounting CD-ROM...\n"
 msgstr "正在掛載光碟機... \n"
 
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:683
 msgid "Scanning disc for index files..\n"
 msgstr "正在掃描碟片中的索引檔..\n"
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:731
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr "找到了 %zu 個套件索引，%zu 個原始碼索引，%zu 個翻譯索引及 %zu 個簽章\n"
 
-#: apt-pkg/cdrom.cc:695
+#: apt-pkg/cdrom.cc:742
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:769
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "找到標籤 '%s'\n"
 
-#: apt-pkg/cdrom.cc:751
+#: apt-pkg/cdrom.cc:798
 msgid "That is not a valid name, try again.\n"
 msgstr "這並不是正確的名稱，請重試。\n"
 
-#: apt-pkg/cdrom.cc:768
+#: apt-pkg/cdrom.cc:815
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3150,293 +3140,366 @@ msgstr ""
 "這個碟片名為：\n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:770
+#: apt-pkg/cdrom.cc:817
 msgid "Copying package lists..."
 msgstr "正在複製套件清單..."
 
-#: apt-pkg/cdrom.cc:797
+#: apt-pkg/cdrom.cc:844
 msgid "Writing new source list\n"
 msgstr "正在寫入新的來源列表\n"
 
-#: apt-pkg/cdrom.cc:805
+#: apt-pkg/cdrom.cc:852
 msgid "Source list entries for this disc are:\n"
 msgstr "該碟片的來源列表項目為：\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "寫入 %i 筆紀錄。\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了。\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案不符\n"
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了，有 %i 個檔案不符\n"
 
-#: apt-pkg/indexcopy.cc:537
+#: apt-pkg/indexcopy.cc:503
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "開啟設定檔 %s"
 
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:509
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:515
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum 不符"
 
-#: apt-pkg/indexcopy.cc:677
+#: apt-pkg/indexcopy.cc:659
 #, 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:708
+#: apt-pkg/indexcopy.cc:690
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "放棄安裝。"
 
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:352
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "找不到 '%2$s' 的 '%1$s' 發行版"
 
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:355
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "找不到 '%s' 版的 '%s'"
 
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:466
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "無法找到主題 %s"
 
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:472
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "無法找到套件 %s"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:483
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:504
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:512
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:520
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:54
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
 msgid "Installing %s"
 msgstr "正在安裝 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:55 apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900
 #, c-format
 msgid "Configuring %s"
 msgstr "正在設定 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:56 apt-pkg/deb/dpkgpm.cc:855
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:907
 #, c-format
 msgid "Removing %s"
 msgstr "正在移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:74
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "已完整移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:58
+#: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:59
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "正在執行安裝後套件後續處理程式 %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:672
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "找不到 '%s' 目錄"
 
-#: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "無法開啟檔案 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:841
+#: apt-pkg/deb/dpkgpm.cc:893
 #, c-format
 msgid "Preparing %s"
 msgstr "正在準備 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/deb/dpkgpm.cc:894
 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解開 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:847
+#: apt-pkg/deb/dpkgpm.cc:899
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在準備設定 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:849
+#: apt-pkg/deb/dpkgpm.cc:901
 #, c-format
 msgid "Installed %s"
 msgstr "已安裝 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:854
+#: apt-pkg/deb/dpkgpm.cc:906
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "正在準備移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:856
+#: apt-pkg/deb/dpkgpm.cc:908
 #, c-format
 msgid "Removed %s"
 msgstr "已移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:861
+#: apt-pkg/deb/dpkgpm.cc:913
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "正在準備完整移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:862
+#: apt-pkg/deb/dpkgpm.cc:914
 #, c-format
 msgid "Completely removed %s"
 msgstr "已完整移除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1082
+#: apt-pkg/deb/dpkgpm.cc:1142
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "無法寫入記錄檔，openpty() 失敗（/dev/pts 未掛載？）\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1113
+#: apt-pkg/deb/dpkgpm.cc:1172
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1338
+#: apt-pkg/deb/dpkgpm.cc:1351
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1343
+#: apt-pkg/deb/dpkgpm.cc:1413
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1345
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1351
+#: apt-pkg/deb/dpkgpm.cc:1421
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1357
+#: apt-pkg/deb/dpkgpm.cc:1427
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1364
+#: apt-pkg/deb/dpkgpm.cc:1434
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
 #, 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:88
+#: apt-pkg/deb/debsystem.cc:103
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:260
+#: methods/mirror.cc:279
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
-#: methods/mirror.cc:267
+#: methods/mirror.cc:286
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "無法開啟檔案 %s"
 
-#: methods/mirror.cc:422
+#: methods/mirror.cc:441
 #, c-format
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:503
+#: methods/rred.cc:472
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:508
+#: methods/rred.cc:477
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rsh.cc:330
+#: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "連線突然終止"
 
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #3"
+
+#~ msgid "decompressor"
+#~ msgstr "解壓縮程式"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "讀取，仍有 %lu 未讀但已無空間"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "寫入，仍有 %lu 待寫入但已沒辨法"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "在處理 %s 時發生錯誤 (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "在處理 %s 時發生錯誤 (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "在處理 %s 時發生錯誤 (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "在處理 %s 時發生錯誤 (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "在處理 %s 時發生錯誤 (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "在處理 %s 時發生錯誤 (NewVersion1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "在處理 %s 時發生錯誤 (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "在處理 %s 時發生錯誤 (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "在處理 %s 時發生錯誤 (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "在處理 %s 時發生錯誤 (CollectFileProvides)"
+
 #~ msgid "Internal error, could not locate member"
 #~ msgstr "內部錯誤：無法找到成員"
 
diff --git a/prepare-release b/prepare-release
new file mode 100755
index 000000000..e02157b24
--- /dev/null
+++ b/prepare-release
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+VERSION=$(dpkg-parsechangelog | sed -n -e '/^Version:/s/^Version: //p')
+DISTRIBUTION=$(dpkg-parsechangelog | sed -n -e '/^Distribution:/s/^Distribution: //p')
+
+if [ "$1" = 'pre-export' ]; then
+	if [ "$DISTRIBUTION" = 'sid' ]; then
+		echo >&2 '»sid« is not a valid distribution. Replace it with »unstable« for you'
+		sed -i -e 's/) sid; urgency=/) unstable; urgency=/' debian/changelog
+		DISTRIBUTION='unstable'
+	elif [ "$DISTRIBUTION" = 'UNRELEASED' ]; then
+		echo >&2 'WARNING: Remember to change to a valid distribution for release'
+		VERSION="$VERSION~$(date +%Y%m%d)"
+	fi
+
+	if [ "$(date +%Y-%m-%d)" != "$(grep --max-count=1 '^"POT-Creation-Date: .*\n"$' po/apt-all.pot | cut -d' ' -f 2)" -o \
+	     "$(date +%Y-%m-%d)" != "$(grep --max-count=1 '^"POT-Creation-Date: .*\n"$' doc/po/apt-doc.pot | cut -d' ' -f 2)" ]; then
+		echo >&2 'POT files are not up-to-date. Execute »make update-po« for you…'
+		make update-po
+	fi
+
+	sed -i -e "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"${VERSION}\"/" configure.in
+elif [ "$1" = 'post-build' ]; then
+	if [ "$DISTRIBUTION" != "UNRELEASED" ]; then
+		echo >&2 "REMEMBER: Tag this release with »bzr tag ${VERSION}« if you are satisfied"
+	else
+		echo >&2 'REMEMBER: Change to a valid distribution before release'
+	fi
+else
+	echo >&1 "Usage:\t$0 pre-export
+\t$0 post-build
+
+If you use »bzr builddeb« you can leave this script alone as it will
+be run at the right places auto-magically. Otherwise you should use
+»pre-export« to update po and pot files as well as version numbering.
+»post-build« can be used to run some more or less useful checks later on."
+fi
diff --git a/test/Makefile b/test/Makefile
index da0a49b0c..b42a90b25 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -6,8 +6,8 @@ ifndef NOISY
 .SILENT:
 endif
 
-.PHONY: headers library clean veryclean all binary program doc test
-all clean veryclean binary program dirs test:
+.PHONY: startup headers library clean veryclean all binary program doc test update-po
+startup all clean veryclean binary program dirs test update-po:
 	$(MAKE) -C libapt $@
 	$(MAKE) -C interactive-helper $@
 
diff --git a/test/integration/Packages-bug-64141-install-dependencies-for-on-hold b/test/integration/Packages-bug-64141-install-dependencies-for-on-hold
deleted file mode 100644
index 7005fa4f4..000000000
--- a/test/integration/Packages-bug-64141-install-dependencies-for-on-hold
+++ /dev/null
@@ -1,42 +0,0 @@
-Package: apt
-Priority: important
-Section: admin
-Installed-Size: 6048
-Maintainer: APT Development Team <deity@lists.debian.org>
-Architecture: i386
-Version: 0.8.10
-Provides: libapt-pkg4.10
-Depends: libc6 (>= 2.10), libdb4.8
-Breaks: oldcrap
-Filename: pool/main/a/apt/apt_0.8.10_i386.deb
-Size: 2160758
-MD5sum: 5aa2234f7b91056d430669cddf6e6e50
-Description: Advanced front-end for dpkg
-
-Package: libc6
-Priority: required
-Section: libs
-Installed-Size: 9356
-Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
-Architecture: i386
-Source: eglibc
-Version: 2.11.2-7
-Provides: glibc-2.11-1
-Filename: pool/main/e/eglibc/libc6_2.11.2-7_i386.deb
-Size: 3880868
-MD5sum: c48fd2854fc62125824267d086600793
-Description: Embedded GNU C Library: Shared libraries
-
-Package: libdb4.8
-Priority: standard
-Section: libs
-Installed-Size: 1488
-Maintainer: Clint Adams <clint@gnu.org>
-Architecture: i386
-Source: db4.8
-Version: 4.8.30-3
-Depends: libc6 (>= 2.3.6-6~)
-Filename: pool/main/d/db4.8/libdb4.8_4.8.30-3_i386.deb
-Size: 681988
-MD5sum: 0d58c15898a95436d2ec480aa22693ff
-Description: Berkeley v4.8 Database Libraries [runtime]
diff --git a/test/integration/Packages-pdiff-usage-new b/test/integration/Packages-pdiff-usage-new
index 9157596a7..4f374b37f 100644
--- a/test/integration/Packages-pdiff-usage-new
+++ b/test/integration/Packages-pdiff-usage-new
@@ -1,16 +1,3 @@
-Package: newstuff
-Version: 1.0
-Architecture: i386
-Maintainer: Joe Sixpack <joe@example.org>
-Installed-Size: 101
-Filename: pool/newstuff_1.0_i386.deb
-Size: 101100
-MD5sum: 311aeeadf78324aaff1ceaf3e1f76671
-SHA1: 3c695e028f7a1ae324deeddaaa1242desa81088c
-SHA256: b46fd154615edefab321cc56a5cc0e7deaef23e2da3e4f129727fd660f28f050
-Description: some cool and shiny new stuff
- This package will appear in the next mirror update
-
 Package: apt
 Priority: important
 Section: admin
@@ -35,3 +22,16 @@ 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.
+
+Package: newstuff
+Version: 1.0
+Architecture: i386
+Maintainer: Joe Sixpack <joe@example.org>
+Installed-Size: 101
+Filename: pool/newstuff_1.0_i386.deb
+Size: 101100
+MD5sum: 311aeeadf78324aaff1ceaf3e1f76671
+SHA1: 3c695e028f7a1ae324deeddaaa1242desa81088c
+SHA256: b46fd154615edefab321cc56a5cc0e7deaef23e2da3e4f129727fd660f28f050
+Description: some cool and shiny new stuff
+ This package will appear in the next mirror update
diff --git a/test/integration/framework b/test/integration/framework
index a2e71760e..0670d6a78 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -25,7 +25,15 @@ msgnwarn() { echo -n "${CWARNING}W: $1${CNORMAL}" >&2; }
 msgnmsg() { echo -n "${CMSG}$1${CNORMAL}" >&2; }
 msgninfo() { echo -n "${CINFO}I: $1${CNORMAL}" >&2; }
 msgndebug() { echo -n "${CDEBUG}D: $1${CNORMAL}" >&2; }
-msgtest() { echo -n "${CINFO}$1 ${CCMD}$(echo "$2" | sed -e 's/^aptc/apt-c/' -e 's/^aptg/apt-g/' -e 's/^aptf/apt-f/')${CINFO} …${CNORMAL} " >&2; }
+msgtest() {
+	while [ -n "$1" ]; do
+		echo -n "${CINFO}$1${CCMD} " >&2;
+		echo -n "$(echo "$2" | sed -e 's/^aptc/apt-c/' -e 's/^aptg/apt-g/' -e 's/^aptf/apt-f/')${CINFO} " >&2;
+		shift
+		if [ -n "$1" ]; then shift; else break; fi
+	done
+	echo -n "…${CNORMAL} " >&2;
+}
 msgpass() { echo "${CPASS}PASS${CNORMAL}" >&2; }
 msgskip() { echo "${CWARNING}SKIP${CNORMAL}" >&2; }
 msgfail() { echo "${CFAIL}FAIL${CNORMAL}" >&2; }
@@ -102,14 +110,14 @@ aptitude() {
 
 addtrap() {
 	CURRENTTRAP="$CURRENTTRAP $1"
-	trap "$CURRENTTRAP" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
+	trap "$CURRENTTRAP exit;" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
 }
 
 setupenvironment() {
 	TMPWORKINGDIRECTORY=$(mktemp -d)
-	local TESTDIR=$(readlink -f $(dirname $0))
+	TESTDIRECTORY=$(readlink -f $(dirname $0))
 	msgninfo "Preparing environment for ${CCMD}$(basename $0)${CINFO} in ${TMPWORKINGDIRECTORY}… "
-	BUILDDIRECTORY="${TESTDIR}/../../build/bin"
+	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;"
@@ -119,25 +127,19 @@ setupenvironment() {
 	mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d
 	mkdir -p var/cache var/lib var/log
 	mkdir -p var/lib/dpkg/info var/lib/dpkg/updates var/lib/dpkg/triggers
-	local STATUSFILE=$(echo "$(basename $0)" | sed -e 's/^test-/status-/' -e 's/^skip-/status-/')
-	if [ -f "${TESTDIR}/${STATUSFILE}" ]; then
-		cp "${TESTDIR}/${STATUSFILE}" var/lib/dpkg/status
-	else
-		touch var/lib/dpkg/status
-	fi
 	touch var/lib/dpkg/available
 	mkdir -p usr/lib/apt
 	ln -s ${BUILDDIRECTORY}/methods usr/lib/apt/methods
 	cd ..
 	local PACKAGESFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Packages-/' -e 's/^skip-/Packages-/')
-	if [ -f "${TESTDIR}/${PACKAGESFILE}" ]; then
-		cp "${TESTDIR}/${PACKAGESFILE}" aptarchive/Packages
+	if [ -f "${TESTDIRECTORY}/${PACKAGESFILE}" ]; then
+		cp "${TESTDIRECTORY}/${PACKAGESFILE}" aptarchive/Packages
 	fi
 	local SOURCESSFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Sources-/' -e 's/^skip-/Sources-/')
-	if [ -f "${TESTDIR}/${SOURCESSFILE}" ]; then
-		cp "${TESTDIR}/${SOURCESSFILE}" aptarchive/Sources
+	if [ -f "${TESTDIRECTORY}/${SOURCESSFILE}" ]; then
+		cp "${TESTDIRECTORY}/${SOURCESSFILE}" aptarchive/Sources
 	fi
-	cp $(find $TESTDIR -name '*.pub' -o -name '*.sec') keys/
+	cp $(find $TESTDIRECTORY -name '*.pub' -o -name '*.sec') keys/
 	ln -s ${TMPWORKINGDIRECTORY}/keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
 	echo "Dir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf
 	echo "Dir::state::status \"${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg/status\";" >> aptconfig.conf
@@ -149,6 +151,9 @@ setupenvironment() {
 	echo "DPKG::options:: \"--root=${TMPWORKINGDIRECTORY}/rootdir\";" >> aptconfig.conf
 	echo "DPKG::options:: \"--force-not-root\";" >> aptconfig.conf
 	echo "DPKG::options:: \"--force-bad-path\";" >> aptconfig.conf
+	if ! $(which dpkg) --assert-multi-arch; then
+		echo "DPKG::options:: \"--force-architecture\";" >> aptconfig.conf # Added to test multiarch before dpkg is ready for it…
+	fi
 	echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf
 	echo 'quiet::NoUpdate "true";' >> aptconfig.conf
 	export LC_ALL=C
@@ -156,15 +161,58 @@ setupenvironment() {
 	msgdone "info"
 }
 
+getarchitecture() {
+	if [ "$1" = "native" -o -z "$1" ]; then
+		eval `aptconfig shell ARCH APT::Architecture`
+		if [ -n "$ARCH" ]; then
+			echo $ARCH
+		else
+			dpkg --print-architecture
+		fi
+	else
+		echo $1
+	fi
+}
+
+getarchitectures() {
+	echo "$(aptconfig dump | grep APT::Architecture | cut -d'"' -f 2 | sed '/^$/ d' | sort | uniq | tr '\n' ' ')"
+}
+
 configarchitecture() {
 	local CONFFILE=rootdir/etc/apt/apt.conf.d/01multiarch.conf
 	rm -f $CONFFILE
-	echo "APT::Architecture \"$1\";" > $CONFFILE
+	echo "APT::Architecture \"$(getarchitecture $1)\";" > $CONFFILE
 	shift
 	while [ -n "$1" ]; do
-		echo "APT::Architectures:: \"$1\";" >> $CONFFILE
+		echo "APT::Architectures:: \"$(getarchitecture $1)\";" >> $CONFFILE
 		shift
 	done
+	configdpkg
+}
+
+configdpkg() {
+	if [ ! -e rootdir/var/lib/dpkg/status ]; then
+		local STATUSFILE=$(echo "$(basename $0)" | sed -e 's/^test-/status-/' -e 's/^skip-/status-/')
+		if [ -f "${TESTDIRECTORY}/${STATUSFILE}" ]; then
+			cp "${TESTDIRECTORY}/${STATUSFILE}" rootdir/var/lib/dpkg/status
+		else
+			echo -n > rootdir/var/lib/dpkg/status
+		fi
+	fi
+	if $(which dpkg) --assert-multi-arch; then
+		local ARCHS="$(getarchitectures)"
+		if echo "$ARCHS" | grep -E -q '[^ ]+ [^ ]+'; then
+			DPKGARCH="$(dpkg --print-architecture)"
+			for ARCH in ${ARCHS}; do
+				if [ "${ARCH}" != "${DPKGARCH}" ]; then dpkg --add-architecture ${ARCH}; fi
+			done
+			if [ "0" = "$(dpkg -l dpkg 2> /dev/null | grep '^i' | wc -l)" ]; then
+				# dpkg doesn't really check the version as long as it is fully installed,
+				# but just to be sure we choose one above the required version
+				insertinstalledpackage 'dpkg' "all" '1.16.2+fake'
+			fi
+		fi
+	fi
 }
 
 setupsimplenativepackage() {
@@ -275,7 +323,7 @@ Package: $NAME" > ${BUILDDIR}/debian/control
 		echo "pool/${SRC}" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.srclist
 	done
 
-	for arch in $(echo "$ARCH" | sed -e 's#,#\n#g'); do
+	for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do
 		rm -rf ${BUILDDIR}/debian/tmp
 		mkdir -p ${BUILDDIR}/debian/tmp/DEBIAN ${BUILDDIR}/debian/tmp/usr/share/doc/${NAME} ${BUILDDIR}/debian/tmp/usr/bin
 		cp ${BUILDDIR}/debian/copyright ${BUILDDIR}/debian/changelog ${BUILDDIR}/FEATURES ${BUILDDIR}/debian/tmp/usr/share/doc/${NAME}
@@ -298,6 +346,7 @@ buildpackage() {
 	local BUILDDIR=$1
 	local RELEASE=$2
 	local SECTION=$3
+	local ARCH=$(getarchitecture $4)
 	msgninfo "Build package $(echo "$BUILDDIR" | grep -o '[^/]*$') for ${RELEASE} in ${SECTION}… "
 	cd $BUILDDIR
 	if [ "$ARCH" = "all" ]; then
@@ -328,7 +377,7 @@ createaptftparchiveconfig() {
 	local ARCHS="$(find pool/ -name '*.deb' | grep -oE '_[a-z0-9-]+\.deb$' | sort | uniq | sed -e '/^_all.deb$/ d' -e 's#^_\([a-z0-9-]*\)\.deb$#\1#' | tr '\n' ' ')"
 	if [ -z "$ARCHS" ]; then
 		# the pool is empty, so we will operate on faked packages - let us use the configured archs
-		ARCHS="$(aptconfig dump | grep APT::Architecture | cut -d'"' -f 2 | sed '/^$/ d' | sort | uniq | tr '\n' ' ')"
+		ARCHS="$(getarchitectures)"
 	fi
 	echo -n 'Dir {
 	ArchiveDir "' >> ftparchive.conf
@@ -408,9 +457,9 @@ insertpackage() {
 	local DEPENDENCIES="$5"
 	local PRIORITY="${6:-optional}"
 	local ARCHS=""
-	for arch in $(echo "$ARCH" | sed -e 's#,#\n#g'); do
+	for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do
 		if [ "$arch" = "all" ]; then
-			ARCHS="$(aptconfig dump | grep APT::Architecture | cut -d'"' -f 2 | sed '/^$/ d' | sort | uniq | tr '\n' ' ')"
+			ARCHS="$(getarchitectures)"
 		else
 			ARCHS="$arch"
 		fi
@@ -464,8 +513,9 @@ insertinstalledpackage() {
 	local VERSION="$3"
 	local DEPENDENCIES="$4"
 	local PRIORITY="${5:-optional}"
-	local FILE="rootdir/var/lib/dpkg/status"
-	for arch in $(echo "$ARCH" | sed -e 's#,#\n#g'); do
+	local FILE='rootdir/var/lib/dpkg/status'
+	local INFO='rootdir/var/lib/dpkg/info'
+	for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do
 		echo "Package: $NAME
 Status: install ok installed
 Priority: $PRIORITY
@@ -480,6 +530,11 @@ Version: $VERSION" >> $FILE
  YOU did something horribly wrong! They are autogenerated
  und used only by testcases for APT and surf no other propose…
 " >> $FILE
+		if [ "$(dpkg-query -W --showformat='${Multi-Arch}')" = 'same' ]; then
+			echo -n > ${INFO}/${NAME}:${arch}.list
+		else
+			echo -n > ${INFO}/${NAME}.list
+		fi
 	done
 }
 
@@ -503,7 +558,7 @@ buildaptarchivefromfiles() {
 		msgninfo "\t${line} file… "
 		cat ${line} | gzip > ${line}.gz
 		cat ${line} | bzip2 > ${line}.bz2
-		cat ${line} | lzma > ${line}.lzma
+		cat ${line} | xz --format=lzma > ${line}.lzma
 		cat ${line} | xz > ${line}.xz
 		msgdone "info"
 	done
@@ -520,9 +575,6 @@ generatereleasefiles() {
 	# both should be given in notation date/touch can understand
 	msgninfo "\tGenerate Release files… "
 	if [ -e aptarchive/dists ]; then
-		for dir in $(find ./aptarchive/dists -mindepth 3 -maxdepth 3 -type d -name 'i18n'); do
-			aptftparchive -qq release $dir -o APT::FTPArchive::Release::Patterns::='Translation-*' > $dir/Index
-		done
 		for dir in $(find ./aptarchive/dists -mindepth 1 -maxdepth 1 -type d); do
 			local SUITE="$(echo "$dir" | cut -d'/' -f 4)"
 			local CODENAME="$(getcodenamefromsuite $SUITE)"
@@ -715,8 +767,7 @@ N: Can't select versions from package '$1' as it is purely virtual"
 N: No packages found"
 	local COMPAREFILE=$(mktemp)
 	addtrap "rm $COMPAREFILE;"
-	local ARCH=$(dpkg-architecture -qDEB_HOST_ARCH_CPU)
-	eval `apt-config shell ARCH APT::Architecture`
+	local ARCH="$(getarchitecture 'native')"
 	echo "$VIRTUAL" | sed -e "s/:$ARCH//" -e 's/:all//' > $COMPAREFILE
 	aptcache show -q=0 $PACKAGE 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
 }
diff --git a/test/integration/skip-avoid-avoiding-breaks-predepends b/test/integration/skip-avoid-avoiding-breaks-predepends
new file mode 100755
index 000000000..a47e8bc2b
--- /dev/null
+++ b/test/integration/skip-avoid-avoiding-breaks-predepends
@@ -0,0 +1,21 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'native'
+
+insertinstalledpackage 'looping' 'native' '1'
+insertinstalledpackage 'loop1' 'native' '1' 'Depends: loop2 (= 1)'
+insertinstalledpackage 'loop2' 'native' '1' 'Depends: loop1 (= 1)'
+
+buildsimplenativepackage 'looping' 'native' '1.15.7.2' 'stable' 'Breaks: loop2 (<= 1)'
+buildsimplenativepackage 'loop1' 'native' '2' 'stable' 'Depends: loop2 (= 2)'
+buildsimplenativepackage 'loop2' 'native' '2' 'stable' 'Depends: loop1 (= 2)
+Pre-Depends: looping (>= 1.15)'
+
+setupaptarchive
+
+aptget dist-upgrade -y -o Debug::pkgOrderList=1 #-qq 2>&1 > /dev/null
+testdpkginstalled looping loop1 loop2
diff --git a/test/integration/status-bug-64141-install-dependencies-for-on-hold b/test/integration/status-bug-64141-install-dependencies-for-on-hold
deleted file mode 100644
index c82ebd19c..000000000
--- a/test/integration/status-bug-64141-install-dependencies-for-on-hold
+++ /dev/null
@@ -1,33 +0,0 @@
-Package: apt
-Status: install ok installed
-Priority: important
-Section: admin
-Installed-Size: 6048
-Maintainer: APT Development Team <deity@lists.debian.org>
-Architecture: i386
-Version: 0.8.9
-Provides: libapt-pkg4.10
-Depends: libc6 (>= 2.3.4)
-Description: Advanced front-end for dpkg
-
-Package: libc6
-Status: install ok installed
-Priority: required
-Section: libs
-Installed-Size: 9356
-Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
-Architecture: i386
-Source: eglibc
-Version: 2.3.5-7
-Provides: glibc-2.11-1
-Description: Embedded GNU C Library: Shared libraries
-
-Package: oldcrap
-Status: install ok installed
-Priority: extra
-Section: oldlibs
-Installed-Size: 1
-Maintainer: Joe Sixpack <joe@example.org>
-Architecture: all
-Version: 1-1
-Description: Old crappy nothing package
diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download
index 7db93c32f..4edb7c173 100755
--- a/test/integration/test-apt-get-download
+++ b/test/integration/test-apt-get-download
@@ -13,13 +13,12 @@ buildsimplenativepackage 'apt' 'all' '2.0' 'unstable'
 setupaptarchive
 
 testdownload() {
-	msgtest 'Test download of package file' $1
-	if [ -z "$3" ]; then
-		aptget download ${2}
-	else
-		aptget download ${2}/${3}
+	local APT="$2"
+	if [ -n "$3" ]; then
+		APT="${APT}/${3}"
 	fi
-	test -f $1 && msgpass || msgfail
+	msgtest "Test download of package file $1 with" "$APT"
+	aptget -qq download ${APT} && test -f $1 && msgpass || msgfail
 }
 
 testdownload apt_1.0_all.deb apt stable
diff --git a/test/integration/test-bug-549968-install-depends-of-not-installed b/test/integration/test-bug-549968-install-depends-of-not-installed
index 78c0801f2..8c434b3ce 100755
--- a/test/integration/test-bug-549968-install-depends-of-not-installed
+++ b/test/integration/test-bug-549968-install-depends-of-not-installed
@@ -14,13 +14,13 @@ setupaptarchive
 
 # We check the Markers here as the autoremove nuker will also
 # prevent it, but to late - its better to fail earlier
-testequal 'Reading package lists...
+testequal "Reading package lists...
 Building dependency tree...
   MarkInstall coolstuff [ i386 ] < none -> 1.0 > ( other ) FU=1
     Ignore MarkInstall of extracoolstuff [ i386 ] < none -> 1.0 > ( other ) as its mode (Keep) is protected
-Package extracoolstuff is not installed, so not removed
+Package 'extracoolstuff' is not installed, so not removed
 The following NEW packages will be installed:
   coolstuff
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst coolstuff (1.0 unstable [all])
-Conf coolstuff (1.0 unstable [all])' aptget install coolstuff extracoolstuff- -o Debug::pkgDepCache::Marker=1 -s
+Conf coolstuff (1.0 unstable [all])" aptget install coolstuff extracoolstuff- -o Debug::pkgDepCache::Marker=1 -s
diff --git a/test/integration/test-bug-590041-prefer-non-virtual-packages b/test/integration/test-bug-590041-prefer-non-virtual-packages
index 3e2693f85..e0dd7737f 100755
--- a/test/integration/test-bug-590041-prefer-non-virtual-packages
+++ b/test/integration/test-bug-590041-prefer-non-virtual-packages
@@ -3,7 +3,7 @@ set -e
 
 . $(readlink -f $(dirname $0))/framework
 setupenvironment
-configarchitecture "i386" "armel"
+configarchitecture 'i386' 'armel'
 
 pkglibc6="Package: libc6
 Architecture: armel
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 5c103da6f..63883b380 100755
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/test/integration/test-bug-595691-empty-and-broken-archive-files
@@ -13,7 +13,7 @@ setupflataptarchive
 testaptgetupdate() {
 	rm -rf rootdir/var/lib/apt
 	aptget update 2>> testaptgetupdate.diff >> testaptgetupdate.diff || true
-	sed -i -e '/^Fetched / d' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff
+	sed -i -e '/^Fetched / d' -e '/Ign / d' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff
 	GIVEN="$1"
 	shift
 	msgtest "Test for correctness of" "apt-get update with $*"
@@ -28,10 +28,10 @@ testaptgetupdate() {
 createemptyarchive() {
 	find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete
 	if [ "en" = "$1" ]; then
-		echo -n "" | $COMPRESSOR > aptarchive/Packages.$COMPRESS
+		echo -n "" | $COMPRESSOR_CMD > aptarchive/Packages.$COMPRESS
 	fi
 	touch aptarchive/Packages
-	echo -n "" | $COMPRESSOR > aptarchive/${1}.$COMPRESS
+	echo -n "" | $COMPRESSOR_CMD > aptarchive/${1}.$COMPRESS
 	generatereleasefiles
 	signreleasefiles
 	rm -f aptarchive/Packages
@@ -40,7 +40,7 @@ createemptyarchive() {
 createemptyfile() {
 	find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete
 	if [ "en" = "$1" ]; then
-		echo -n "" | $COMPRESSOR > aptarchive/Packages.$COMPRESS
+		echo -n "" | $COMPRESSOR_CMD > aptarchive/Packages.$COMPRESS
 	fi
 	touch aptarchive/Packages aptarchive/${1}.$COMPRESS
 	generatereleasefiles
@@ -50,6 +50,7 @@ createemptyfile() {
 
 setupcompressor() {
 	COMPRESSOR="$1"
+	COMPRESSOR_CMD="$1"
 	case $COMPRESSOR in
 	gzip) COMPRESS="gz";;
 	bzip2) COMPRESS="bz2";;
@@ -66,10 +67,13 @@ Dir::Bin::xz \"/does/not/exist\";" > rootdir/etc/apt/apt.conf.d/00compressor
 		echo "Dir::Bin::${COMPRESSOR} \"/bin/${COMPRESSOR}\";" >> rootdir/etc/apt/apt.conf.d/00compressor
 	elif [ -e "/usr/bin/${COMPRESSOR}" ]; then
 		echo "Dir::Bin::${COMPRESSOR} \"/usr/bin/${COMPRESSOR}\";" >> rootdir/etc/apt/apt.conf.d/00compressor
+	elif [ "${COMPRESSOR}" = 'lzma' ]; then
+		echo "Dir::Bin::xz \"/usr/bin/xz\";" >> rootdir/etc/apt/apt.conf.d/00compressor
+		COMPRESSOR_CMD='xz --format=lzma'
 	else
 		msgtest "Test for availability of compressor" "${COMPRESSOR}"
 		msgfail
-		exit 1
+		#exit 1
 	fi
 }
 
@@ -78,7 +82,6 @@ testoverfile() {
 
 	createemptyfile 'en'
 	testaptgetupdate "Get:1 file:  InRelease []
-Ign file:  Translation-en
 Reading package lists..." "empty file en.$COMPRESS over file"
 
 	createemptyarchive 'en'
@@ -89,12 +92,10 @@ Reading package lists..." "empty archive en.$COMPRESS over file"
 	# FIXME: Why omits the file transport the Packages Get line?
 	#Get:3 file:  Packages []
 	testaptgetupdate "Get:1 file:  InRelease []
-Ign file:  Translation-en
 Reading package lists..." "empty archive Packages.$COMPRESS over file"
 
 	createemptyfile 'Packages'
 	testaptgetupdate "Get:1 file:  InRelease []
-Ign file:  Translation-en
 Err file:  Packages
   Empty files can't be valid archives
 W: Failed to fetch ${COMPRESSOR}:$(readlink -f aptarchive/Packages.$COMPRESS)  Empty files can't be valid archives
@@ -109,7 +110,6 @@ testoverhttp() {
 	testaptgetupdate "Get:1 http://localhost  InRelease []
 Get:2 http://localhost  Packages []
 Get:3 http://localhost  Translation-en
-Ign http://localhost  Translation-en
 Reading package lists..." "empty file en.$COMPRESS over http"
 
 	createemptyarchive 'en'
@@ -121,14 +121,12 @@ Reading package lists..." "empty archive en.$COMPRESS over http"
 	createemptyarchive 'Packages'
 	testaptgetupdate "Get:1 http://localhost  InRelease []
 Get:2 http://localhost  Packages []
-Ign http://localhost  Translation-en
 Reading package lists..." "empty archive Packages.$COMPRESS over http"
 
 	createemptyfile 'Packages'
 	#FIXME: we should response with a good error message instead
 	testaptgetupdate "Get:1 http://localhost  InRelease []
 Get:2 http://localhost  Packages
-Ign http://localhost  Translation-en
 Err http://localhost  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-596498-trusted-unsigned-repo b/test/integration/test-bug-596498-trusted-unsigned-repo
new file mode 100755
index 000000000..6ebc4a3bb
--- /dev/null
+++ b/test/integration/test-bug-596498-trusted-unsigned-repo
@@ -0,0 +1,47 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'i386'
+
+buildsimplenativepackage 'cool' 'i386' '1.0' 'unstable'
+
+setupaptarchive
+
+aptgetupdate() {
+	rm -rf rootdir/var/lib/apt/ rootdir/var/cache/apt/*.bin
+	aptget update -qq
+}
+
+PKGTEXT="$(aptget install cool --assume-no -d | head -n 7)"
+DEBFILE='rootdir/etc/apt/sources.list.d/apt-test-unstable-deb.list'
+
+testequal "$PKGTEXT
+Download complete and in download only mode" aptget install cool --assume-no -d
+
+sed -i -e 's#deb#deb [trusted=no]#' $DEBFILE
+aptgetupdate
+
+testequal "$PKGTEXT
+WARNING: The following packages cannot be authenticated!
+  cool
+Install these packages without verification [y/N]? N
+E: Some packages could not be authenticated" aptget install cool --assume-no -d
+
+find aptarchive/ \( -name 'Release.gpg' -o -name 'InRelease' \) -delete
+sed -i -e 's#deb \[trusted=no\]#deb#' $DEBFILE
+aptgetupdate
+
+testequal "$PKGTEXT
+WARNING: The following packages cannot be authenticated!
+  cool
+Install these packages without verification [y/N]? N
+E: Some packages could not be authenticated" aptget install cool --assume-no -d
+
+sed -i -e 's#deb#deb [trusted=yes]#' $DEBFILE
+aptgetupdate
+
+testequal "$PKGTEXT
+Download complete and in download only mode" aptget install cool --assume-no -d
diff --git a/test/integration/test-bug-601016-description-translation b/test/integration/test-bug-601016-description-translation
index 44ab91900..03fddbfda 100755
--- a/test/integration/test-bug-601016-description-translation
+++ b/test/integration/test-bug-601016-description-translation
@@ -4,7 +4,7 @@ set -e
 TESTDIR=$(readlink -f $(dirname $0))
 . $TESTDIR/framework
 setupenvironment
-configarchitecture "i386"
+configarchitecture 'i386' 'amd64'
 
 # we need a valid locale here, otherwise the language configuration
 # will be overridden by LC_ALL=C
@@ -22,8 +22,22 @@ Size: 2140230
 MD5sum: 74769bfbcef9ebc4fa74f7a5271b9c08
 Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c"
 
+PACKAGESTANZA2='Package: apt
+Priority: important
+Section: admin
+Installed-Size: 5984
+Maintainer: APT Development Team <deity@lists.debian.org>
+Architecture: amd64
+Version: 0.8.7
+Filename: pool/main/a/apt/apt_0.8.7_amd64.deb
+Size: 2210342
+MD5sum: 4a869bfbdef9ebc9fa74f7a5271e8d1a
+Description-md5: d41ee493aa9fcc6cbc9ce4eb7069959c'
 
 echo "$PACKAGESTANZA
+Description: Advanced front-end for dpkg
+
+$PACKAGESTANZA2
 Description: Advanced front-end for dpkg" > aptarchive/Packages
 
 echo "Package: apt
@@ -53,6 +67,13 @@ Description-${LOCALE}: Mächtige Oberfläche für dpkg
  APT-Dselect-Methode. Beides sind einfache und sicherere Wege,
  um Pakete zu installieren und Upgrades durchzuführen.
 "
+LOCALESTANZA2="$PACKAGESTANZA2
+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.
+"
 
 testrun() {
 	echo "Acquire::Languages { \"${LOCALE}\"; \"en\"; };" > rootdir/etc/apt/apt.conf.d/00languages
@@ -60,6 +81,8 @@ testrun() {
 	rm -rf rootdir/var/lib/apt/lists
 	setupaptarchive
 	testequal "$LOCALESTANZA" aptcache show apt -o Test=File-${LOCALE}
+	testequal "$LOCALESTANZA" aptcache show apt:i386 -o Test=File-${LOCALE}
+	testequal "$LOCALESTANZA2" aptcache show apt:amd64 -o Test=File-${LOCALE}
 	testequal "$NOLONGSTANZA" aptcache show apt -o Acquire::Languages="ww" -o Test=File-${LOCALE}
 	testequal "$LOCALESTANZA" aptcache show apt -o Acquire::Languages::="ww" -o Test=File-${LOCALE}
 	LC_ALL=C testequal "$ENGLISHSTANZA" aptcache show apt -o Test=File-${LOCALE}
@@ -73,6 +96,9 @@ testrun() {
 testrun
 
 echo "$PACKAGESTANZA
+Description: Advanced front-end for dpkg
+
+$PACKAGESTANZA2
 Description: Advanced front-end for dpkg" > aptarchive/Packages
 
 echo "Package: apt
@@ -88,5 +114,11 @@ Description-en: Advanced front-end for dpkg
  It provides the apt-get utility and APT dselect method that provides a
  simpler, safer way to install and upgrade packages.
 "
+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.
+"
 
 testrun
diff --git a/test/integration/test-bug-604222-new-and-autoremove b/test/integration/test-bug-604222-new-and-autoremove
index 2875d547a..5820fb0dc 100755
--- a/test/integration/test-bug-604222-new-and-autoremove
+++ b/test/integration/test-bug-604222-new-and-autoremove
@@ -16,7 +16,7 @@ Building dependency tree...
 Reading state information...
 The following package was automatically installed and is no longer required:
   libvtk5.4
-Use 'apt-get autoremove' to remove them.
+Use 'apt-get autoremove' to remove it.
 The following NEW packages will be installed:
   libavcodec52
 0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
@@ -28,7 +28,7 @@ Building dependency tree...
 Reading state information...
 The following package was automatically installed and is no longer required:
   libvtk5.4
-Use 'apt-get autoremove' to remove them.
+Use 'apt-get autoremove' to remove it.
 The following extra packages will be installed:
   libavcodec52 libopenal-dev libvtk5.4
 The following NEW packages will be installed:
diff --git a/test/integration/test-bug-612099-multiarch-conflicts b/test/integration/test-bug-612099-multiarch-conflicts
index b8cfe59e2..530012e5d 100755
--- a/test/integration/test-bug-612099-multiarch-conflicts
+++ b/test/integration/test-bug-612099-multiarch-conflicts
@@ -4,9 +4,7 @@ set -e
 TESTDIR=$(readlink -f $(dirname $0))
 . $TESTDIR/framework
 setupenvironment
-configarchitecture "i386" "amd64"
-
-buildsimplenativepackage 'peace-dpkg' 'all' '1.0' 'stable'
+configarchitecture 'i386' 'amd64'
 
 buildsimplenativepackage 'libc6' 'i386' '1.0' 'stable'
 buildsimplenativepackage 'libc6' 'amd64' '1.0' 'stable'
@@ -17,11 +15,8 @@ buildsimplenativepackage 'foobar' 'amd64' '1.0' 'stable' 'Depends: libc6'
 
 setupaptarchive
 
-aptget install peace-dpkg:i386 -y -qq 2>&1 > /dev/null
-testdpkginstalled peace-dpkg
-
 aptget install libc6:i386 -t stable -y -qq 2>&1 > /dev/null
-testdpkginstalled libc6
+testdpkginstalled libc6:i386
 testequal 'Reading package lists...
 Building dependency tree...
 Reading state information...
@@ -80,8 +75,13 @@ The following packages will be upgraded:
 1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Inst libc6 [1.0] (2.0 testing [all])
 Conf libc6 (2.0 testing [all])' aptget upgrade -t testing -s
-aptget upgrade -y -qq 2>&1 > /dev/null
-testdpkginstalled libc6
+# FIXME: on amd64 systems this test wouldn't run with a real upgrade
+# as APT (here i386) disagree about the native architecture, so
+# we fake it here:
+#aptget upgrade -y -qq 2>&1 > /dev/null
+aptget purge libc6 -y -qq 2>&1 >/dev/null
+aptget install libc6:i386 -y -qq 2>&1 >/dev/null
+testdpkginstalled libc6:all
 
 testequal 'Reading package lists...
 Building dependency tree...
@@ -130,7 +130,7 @@ buildsimplenativepackage 'foobar-same' 'amd64' '1.0' 'stable' 'Depends: libc6-sa
 setupaptarchive
 
 aptget install libc6-same:i386 -t stable -y -qq 2>&1 > /dev/null
-testdpkginstalled libc6-same
+testdpkginstalled libc6-same:i386
 
 testequal 'Reading package lists...
 Building dependency tree...
@@ -173,8 +173,14 @@ The following packages will be upgraded:
 1 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Inst libc6-same [1.0] (2.0 testing [all])
 Conf libc6-same (2.0 testing [all])' aptget upgrade -t testing -s
-aptget upgrade -y -qq 2>&1 > /dev/null
-testdpkginstalled libc6-same
+# FIXME: on amd64 systems this test wouldn't run with a real upgrade
+# as APT (here i386) disagree about the native architecture, so
+# we fake it here:
+#aptget upgrade -y -qq 2>&1 > /dev/null
+aptget purge libc6-same -y -qq 2>&1 >/dev/null
+aptget install libc6-same:i386 -y -qq 2>&1 >/dev/null
+testdpkginstalled libc6-same:all
+
 
 testequal "Reading package lists...
 Building dependency tree...
diff --git a/test/integration/test-bug-612958-use-dpkg-multiarch-config b/test/integration/test-bug-612958-use-dpkg-multiarch-config
index 4f31c3953..18b964636 100755
--- a/test/integration/test-bug-612958-use-dpkg-multiarch-config
+++ b/test/integration/test-bug-612958-use-dpkg-multiarch-config
@@ -56,4 +56,22 @@ testfail 'dpkg config' 'armel'
 echo '#! /bin/sh
 echo "amd64 armel"' > ./dpkg-printer
 
+testpass 'dpkg config' 'i386'
+testpass 'dpkg config' 'amd64'
+testpass 'dpkg config' 'armel'
+
+echo '#! /bin/sh
+echo "amd64
+armel"' > ./dpkg-printer
+
+testpass 'dpkg config' 'i386'
+testpass 'dpkg config' 'amd64'
 testpass 'dpkg config' 'armel'
+
+echo '#! /bin/sh
+echo "amd64
+i386"' > ./dpkg-printer
+
+testpass 'dpkg config' 'i386'
+testpass 'dpkg config' 'amd64'
+testfail 'dpkg config' 'armel'
diff --git a/test/integration/test-bug-613420-new-garbage-dependency b/test/integration/test-bug-613420-new-garbage-dependency
index 34cf38cbc..7a08871ca 100755
--- a/test/integration/test-bug-613420-new-garbage-dependency
+++ b/test/integration/test-bug-613420-new-garbage-dependency
@@ -22,7 +22,7 @@ testequal "Reading package lists...
 Building dependency tree...
 Reading state information...
 The following packages were automatically installed and are no longer required:
-  openoffice.org-officebean libreoffice-officebean
+  libreoffice-officebean openoffice.org-officebean
 Use 'apt-get autoremove' to remove them.
 The following extra packages will be installed:
   libreoffice-core libreoffice-officebean openoffice.org-officebean
diff --git a/test/integration/test-bug-618288-multiarch-same-lockstep b/test/integration/test-bug-618288-multiarch-same-lockstep
index a05f03df4..fde075172 100755
--- a/test/integration/test-bug-618288-multiarch-same-lockstep
+++ b/test/integration/test-bug-618288-multiarch-same-lockstep
@@ -16,17 +16,22 @@ buildsimplenativepackage 'apt' 'i386' '2' 'unstable' 'Depends: libsame (= 2)' ''
 buildsimplenativepackage 'apt2' 'amd64' '2' 'unstable' 'Depends: libsame (= 2)' '' 'required'
 
 setupaptarchive
+aptget dist-upgrade -s 2>&1 > output.apt
 
-testequal 'Reading package lists...
-Building dependency tree...
-The following packages will be upgraded:
-  apt:i386 apt2 libsame libsame:i386
-4 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Inst libsame:i386 [1] (2 unstable [i386]) [libsame:amd64 on libsame:i386] [libsame:i386 on libsame:amd64] [libsame:amd64 apt:i386 ]
-Inst libsame [1] (2 unstable [amd64]) [apt2:amd64 apt:i386 ]
-Conf libsame:i386 (2 unstable [i386]) [apt2:amd64 apt:i386 ]
-Conf libsame (2 unstable [amd64]) [apt2:amd64 apt:i386 ]
-Inst apt2 [1] (2 unstable [amd64]) [apt:i386 ]
-Conf apt2 (2 unstable [amd64]) [apt:i386 ]
-Inst apt:i386 [1] (2 unstable [i386])
-Conf apt:i386 (2 unstable [i386])' aptget dist-upgrade -s
+# order in switch libsame:{amd64,i386} are unpacked is irrelevant, as both are installed - but we need to do it together
+LS_U_AMD="$(grep -o -n '^Inst libsame ' output.apt | cut -d: -f1)"
+LS_U_INT="$(grep -o -n '^Inst libsame:i386 ' output.apt | cut -d: -f1)"
+LS_C_AMD="$(grep -o -n '^Conf libsame ' output.apt | cut -d: -f1)"
+LS_C_INT="$(grep -o -n '^Conf libsame:i386 ' output.apt | cut -d: -f1)"
+
+msgtest 'Test if libsame:amd64 unpack before configure'
+test "$LS_U_AMD" -lt "$LS_C_AMD" && msgpass || msgfail
+
+msgtest 'Test if libsame:i386 unpack before configure'
+test "$LS_U_INT" -lt "$LS_C_INT" && msgpass || msgfail
+
+msgtest 'Test if libsame:amd64 unpack is before libsame:i386 configure'
+test "$LS_U_AMD" -lt "$LS_C_INT" && msgpass || msgfail
+
+msgtest 'Test if libsame:i386 unpack is before libsame:amd64 configure'
+test "$LS_U_INT" -lt "$LS_C_AMD" && msgpass || msgfail
diff --git a/test/integration/test-bug-624218-Translation-file-handling b/test/integration/test-bug-624218-Translation-file-handling
index a1e708d2e..d146b943c 100755
--- a/test/integration/test-bug-624218-Translation-file-handling
+++ b/test/integration/test-bug-624218-Translation-file-handling
@@ -42,16 +42,9 @@ msgtest 'Download of nothing if none is forced' 'with Index'
 aptget update -o Acquire::Languages=none | grep -q -e 'Translation' && msgfail || msgpass
 rm -rf rootdir/var/lib/apt/lists
 
-sed -i '/i18n\/Index$/ d' $(find aptarchive -name 'Release')
+sed -i '/i18n\/Translation-.*$/ d' $(find aptarchive -name 'Release')
 signreleasefiles
 
-# we have to try as not every archive includes the i18n Index in the Release file - if it has one at all
-msgtest 'Download no Translation- if forced language is non-existent' 'with not-announced Index'
-aptget update -o Acquire::Languages=ast_DE | grep -q -e 'Translation-' && msgfail || msgpass
-rm -rf rootdir/var/lib/apt/lists
-
-find aptarchive -name 'Index' -delete
-
 msgtest 'Download of en as forced language' 'without Index'
 aptget update -o Acquire::Languages=en | grep -q -e 'Translation-en ' && msgpass || msgfail
 rm -rf rootdir/var/lib/apt/lists
diff --git a/test/integration/test-bug-632221-cross-dependency-satisfaction b/test/integration/test-bug-632221-cross-dependency-satisfaction
index 4299f052f..30df48604 100755
--- a/test/integration/test-bug-632221-cross-dependency-satisfaction
+++ b/test/integration/test-bug-632221-cross-dependency-satisfaction
@@ -6,43 +6,51 @@ TESTDIR=$(readlink -f $(dirname $0))
 setupenvironment
 configarchitecture 'amd64' 'armel'
 
-insertinstalledpackage 'build-essential' 'all' '11.5'
+insertinstalledpackage 'build-essential' 'all' '11.5' 'Multi-Arch: foreign'
 
-insertpackage 'unstable' 'doxygen' 'amd64,armel' '1.0'
+insertpackage 'unstable' 'doxygen' 'amd64,armel' '1.0' 'Multi-Arch: foreign'
 insertpackage 'unstable' 'libc6' 'amd64,armel' '1.0' 'Multi-Arch: same'
 insertpackage 'unstable' 'libc6-dev' 'amd64,armel' '1.0' 'Depends: libc6
 Multi-Arch: same'
+insertpackage 'unstable' 'libfwibble1' 'amd64,armel' '1.0' 'Depends: libc6
+Multi-Arch: same'
+insertpackage 'unstable' 'libfwibble-dev' 'amd64,armel' '1.0' 'Depends: libfwibble1'
 insertpackage 'unstable' 'cool' 'amd64,armel' '1.0' 'Multi-Arch: allowed'
 insertpackage 'unstable' 'amdboot' 'amd64' '1.0'
 insertpackage 'unstable' 'foreigner' 'amd64,armel' '1.0' 'Multi-Arch: foreign'
 
-insertsource 'unstable' 'apt' 'any' '0.8.15' 'Build-Depends: doxygen, libc6-dev, libc6-dev:native, cool:any, amdboot:amd64, foreigner'
+insertsource 'unstable' 'apt' 'any' '0.8.15' 'Build-Depends: doxygen, libc6-dev, libc6-dev:native, cool:any, amdboot:amd64, foreigner, libfwibble-dev'
 
 setupaptarchive
 
 testequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
-  amdboot cool doxygen foreigner libc6 libc6-dev
-0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded.
+  amdboot cool doxygen foreigner libc6 libc6-dev libfwibble-dev libfwibble1
+0 upgraded, 8 newly installed, 0 to remove and 0 not upgraded.
 Inst amdboot (1.0 unstable [amd64])
 Inst cool (1.0 unstable [amd64])
 Inst doxygen (1.0 unstable [amd64])
 Inst foreigner (1.0 unstable [amd64])
 Inst libc6 (1.0 unstable [amd64])
 Inst libc6-dev (1.0 unstable [amd64])
+Inst libfwibble1 (1.0 unstable [amd64])
+Inst libfwibble-dev (1.0 unstable [amd64])
 Conf amdboot (1.0 unstable [amd64])
 Conf cool (1.0 unstable [amd64])
 Conf doxygen (1.0 unstable [amd64])
 Conf foreigner (1.0 unstable [amd64])
 Conf libc6 (1.0 unstable [amd64])
-Conf libc6-dev (1.0 unstable [amd64])' aptget build-dep apt -s
+Conf libc6-dev (1.0 unstable [amd64])
+Conf libfwibble1 (1.0 unstable [amd64])
+Conf libfwibble-dev (1.0 unstable [amd64])' aptget build-dep apt -s
 
 testequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
   amdboot cool doxygen foreigner libc6 libc6:armel libc6-dev libc6-dev:armel
-0 upgraded, 8 newly installed, 0 to remove and 0 not upgraded.
+  libfwibble-dev:armel libfwibble1:armel
+0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
 Inst amdboot (1.0 unstable [amd64])
 Inst cool (1.0 unstable [amd64])
 Inst doxygen (1.0 unstable [amd64])
@@ -51,6 +59,8 @@ Inst libc6 (1.0 unstable [amd64])
 Inst libc6:armel (1.0 unstable [armel])
 Inst libc6-dev (1.0 unstable [amd64])
 Inst libc6-dev:armel (1.0 unstable [armel])
+Inst libfwibble1:armel (1.0 unstable [armel])
+Inst libfwibble-dev:armel (1.0 unstable [armel])
 Conf amdboot (1.0 unstable [amd64])
 Conf cool (1.0 unstable [amd64])
 Conf doxygen (1.0 unstable [amd64])
@@ -58,34 +68,41 @@ Conf foreigner (1.0 unstable [amd64])
 Conf libc6 (1.0 unstable [amd64])
 Conf libc6:armel (1.0 unstable [armel])
 Conf libc6-dev (1.0 unstable [amd64])
-Conf libc6-dev:armel (1.0 unstable [armel])' aptget build-dep apt -s -a armel
+Conf libc6-dev:armel (1.0 unstable [armel])
+Conf libfwibble1:armel (1.0 unstable [armel])
+Conf libfwibble-dev:armel (1.0 unstable [armel])' aptget build-dep apt -s -a armel
 
 configarchitecture 'armel' 'amd64'
 
 testequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
-  amdboot:amd64 cool doxygen foreigner libc6 libc6-dev
-0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded.
+  amdboot:amd64 cool doxygen foreigner libc6 libc6-dev libfwibble-dev
+  libfwibble1
+0 upgraded, 8 newly installed, 0 to remove and 0 not upgraded.
 Inst amdboot:amd64 (1.0 unstable [amd64])
 Inst cool (1.0 unstable [armel])
 Inst doxygen (1.0 unstable [armel])
 Inst foreigner (1.0 unstable [armel])
 Inst libc6 (1.0 unstable [armel])
 Inst libc6-dev (1.0 unstable [armel])
+Inst libfwibble1 (1.0 unstable [armel])
+Inst libfwibble-dev (1.0 unstable [armel])
 Conf amdboot:amd64 (1.0 unstable [amd64])
 Conf cool (1.0 unstable [armel])
 Conf doxygen (1.0 unstable [armel])
 Conf foreigner (1.0 unstable [armel])
 Conf libc6 (1.0 unstable [armel])
-Conf libc6-dev (1.0 unstable [armel])' aptget build-dep apt -s
+Conf libc6-dev (1.0 unstable [armel])
+Conf libfwibble1 (1.0 unstable [armel])
+Conf libfwibble-dev (1.0 unstable [armel])' aptget build-dep apt -s
 
 testequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
   amdboot:amd64 cool doxygen foreigner libc6:amd64 libc6 libc6-dev:amd64
-  libc6-dev
-0 upgraded, 8 newly installed, 0 to remove and 0 not upgraded.
+  libc6-dev libfwibble-dev:amd64 libfwibble1:amd64
+0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
 Inst amdboot:amd64 (1.0 unstable [amd64])
 Inst cool (1.0 unstable [armel])
 Inst doxygen (1.0 unstable [armel])
@@ -94,6 +111,8 @@ Inst libc6:amd64 (1.0 unstable [amd64])
 Inst libc6 (1.0 unstable [armel])
 Inst libc6-dev:amd64 (1.0 unstable [amd64])
 Inst libc6-dev (1.0 unstable [armel])
+Inst libfwibble1:amd64 (1.0 unstable [amd64])
+Inst libfwibble-dev:amd64 (1.0 unstable [amd64])
 Conf amdboot:amd64 (1.0 unstable [amd64])
 Conf cool (1.0 unstable [armel])
 Conf doxygen (1.0 unstable [armel])
@@ -101,7 +120,9 @@ Conf foreigner (1.0 unstable [armel])
 Conf libc6:amd64 (1.0 unstable [amd64])
 Conf libc6 (1.0 unstable [armel])
 Conf libc6-dev:amd64 (1.0 unstable [amd64])
-Conf libc6-dev (1.0 unstable [armel])' aptget build-dep apt -s -a amd64
+Conf libc6-dev (1.0 unstable [armel])
+Conf libfwibble1:amd64 (1.0 unstable [amd64])
+Conf libfwibble-dev:amd64 (1.0 unstable [amd64])' aptget build-dep apt -s -a amd64
 
 configarchitecture 'amd64' 'armel'
 
@@ -111,34 +132,43 @@ insertinstalledpackage 'foreigner' 'armel' '0.5'
 testequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
-  amdboot doxygen libc6 libc6-dev
-0 upgraded, 4 newly installed, 0 to remove and 2 not upgraded.
+  amdboot doxygen libc6 libc6-dev libfwibble-dev libfwibble1
+0 upgraded, 6 newly installed, 0 to remove and 2 not upgraded.
 Inst amdboot (1.0 unstable [amd64])
 Inst doxygen (1.0 unstable [amd64])
 Inst libc6 (1.0 unstable [amd64])
 Inst libc6-dev (1.0 unstable [amd64])
+Inst libfwibble1 (1.0 unstable [amd64])
+Inst libfwibble-dev (1.0 unstable [amd64])
 Conf amdboot (1.0 unstable [amd64])
 Conf doxygen (1.0 unstable [amd64])
 Conf libc6 (1.0 unstable [amd64])
-Conf libc6-dev (1.0 unstable [amd64])' aptget build-dep apt -s
+Conf libc6-dev (1.0 unstable [amd64])
+Conf libfwibble1 (1.0 unstable [amd64])
+Conf libfwibble-dev (1.0 unstable [amd64])' aptget build-dep apt -s
 
 testequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
   amdboot doxygen libc6 libc6:armel libc6-dev libc6-dev:armel
-0 upgraded, 6 newly installed, 0 to remove and 2 not upgraded.
+  libfwibble-dev:armel libfwibble1:armel
+0 upgraded, 8 newly installed, 0 to remove and 2 not upgraded.
 Inst amdboot (1.0 unstable [amd64])
 Inst doxygen (1.0 unstable [amd64])
 Inst libc6 (1.0 unstable [amd64])
 Inst libc6:armel (1.0 unstable [armel])
 Inst libc6-dev (1.0 unstable [amd64])
 Inst libc6-dev:armel (1.0 unstable [armel])
+Inst libfwibble1:armel (1.0 unstable [armel])
+Inst libfwibble-dev:armel (1.0 unstable [armel])
 Conf amdboot (1.0 unstable [amd64])
 Conf doxygen (1.0 unstable [amd64])
 Conf libc6 (1.0 unstable [amd64])
 Conf libc6:armel (1.0 unstable [armel])
 Conf libc6-dev (1.0 unstable [amd64])
-Conf libc6-dev:armel (1.0 unstable [armel])' aptget build-dep apt -s -a armel
+Conf libc6-dev:armel (1.0 unstable [armel])
+Conf libfwibble1:armel (1.0 unstable [armel])
+Conf libfwibble-dev:armel (1.0 unstable [armel])' aptget build-dep apt -s -a armel
 
 configarchitecture 'armel' 'amd64'
 
@@ -148,36 +178,45 @@ Building dependency tree...
 The following packages will be REMOVED:
   cool:amd64
 The following NEW packages will be installed:
-  amdboot:amd64 cool doxygen libc6 libc6-dev
-0 upgraded, 5 newly installed, 1 to remove and 1 not upgraded.
+  amdboot:amd64 cool doxygen libc6 libc6-dev libfwibble-dev libfwibble1
+0 upgraded, 7 newly installed, 1 to remove and 1 not upgraded.
 Remv cool:amd64 [0.5]
 Inst amdboot:amd64 (1.0 unstable [amd64])
 Inst cool (1.0 unstable [armel])
 Inst doxygen (1.0 unstable [armel])
 Inst libc6 (1.0 unstable [armel])
 Inst libc6-dev (1.0 unstable [armel])
+Inst libfwibble1 (1.0 unstable [armel])
+Inst libfwibble-dev (1.0 unstable [armel])
 Conf amdboot:amd64 (1.0 unstable [amd64])
 Conf cool (1.0 unstable [armel])
 Conf doxygen (1.0 unstable [armel])
 Conf libc6 (1.0 unstable [armel])
-Conf libc6-dev (1.0 unstable [armel])' aptget build-dep apt -s
+Conf libc6-dev (1.0 unstable [armel])
+Conf libfwibble1 (1.0 unstable [armel])
+Conf libfwibble-dev (1.0 unstable [armel])' aptget build-dep apt -s
 
 testequal 'Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
   amdboot:amd64 doxygen libc6:amd64 libc6 libc6-dev:amd64 libc6-dev
-0 upgraded, 6 newly installed, 0 to remove and 2 not upgraded.
+  libfwibble-dev:amd64 libfwibble1:amd64
+0 upgraded, 8 newly installed, 0 to remove and 2 not upgraded.
 Inst amdboot:amd64 (1.0 unstable [amd64])
 Inst doxygen (1.0 unstable [armel])
 Inst libc6:amd64 (1.0 unstable [amd64])
 Inst libc6 (1.0 unstable [armel])
 Inst libc6-dev:amd64 (1.0 unstable [amd64])
 Inst libc6-dev (1.0 unstable [armel])
+Inst libfwibble1:amd64 (1.0 unstable [amd64])
+Inst libfwibble-dev:amd64 (1.0 unstable [amd64])
 Conf amdboot:amd64 (1.0 unstable [amd64])
 Conf doxygen (1.0 unstable [armel])
 Conf libc6:amd64 (1.0 unstable [amd64])
 Conf libc6 (1.0 unstable [armel])
 Conf libc6-dev:amd64 (1.0 unstable [amd64])
-Conf libc6-dev (1.0 unstable [armel])' aptget build-dep apt -s -a amd64
+Conf libc6-dev (1.0 unstable [armel])
+Conf libfwibble1:amd64 (1.0 unstable [amd64])
+Conf libfwibble-dev:amd64 (1.0 unstable [amd64])' aptget build-dep apt -s -a amd64
 
 
diff --git a/test/integration/test-bug-64141-install-dependencies-for-on-hold b/test/integration/test-bug-64141-install-dependencies-for-on-hold
index 4633ffcc3..e2d206fdd 100755
--- a/test/integration/test-bug-64141-install-dependencies-for-on-hold
+++ b/test/integration/test-bug-64141-install-dependencies-for-on-hold
@@ -4,7 +4,19 @@ set -e
 TESTDIR=$(readlink -f $(dirname $0))
 . $TESTDIR/framework
 setupenvironment
-configarchitecture "i386"
+configarchitecture 'native' 'strange-arch'
+
+insertpackage 'unstable' 'unrelated' 'strange-arch' '1'
+
+insertinstalledpackage 'apt' 'native' '0.8.9' 'Depends: libc6 (>= 2.3.4)'
+insertinstalledpackage 'libc6' 'native' '2.4.1-1'
+insertinstalledpackage 'oldcrap' 'all' '1-1'
+
+insertpackage 'unstable' 'apt' 'native' '0.8.10' 'Depends: libc6 (>= 2.10), libdb4.8
+Breaks: oldcrap'
+insertpackage 'unstable' 'libc6' 'native' '2.11.2-7'
+insertpackage 'unstable' 'libdb4.8' 'native' '4.8.30-3'
+
 setupaptarchive
 
 testequal 'Reading package lists...
@@ -16,11 +28,10 @@ The following NEW packages will be installed:
 The following packages will be upgraded:
   apt libc6
 2 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
-Need to get 0 B/6724 kB of archives.
-After this operation, 1523 kB of additional disk space will be used.
+After this operation, 0 B of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only
 
-echo 'apt hold' | dpkg --set-selections
+aptmark hold apt -qq
 
 testequal 'Reading package lists...
 Building dependency tree...
@@ -29,6 +40,5 @@ The following packages have been kept back:
 The following packages will be upgraded:
   libc6
 1 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.
-Need to get 0 B/3881 kB of archives.
 After this operation, 0 B of additional disk space will be used.
 E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only -o Test='hold-back-apt'
diff --git a/test/integration/test-bug-657695-resolver-breaks-on-virtuals b/test/integration/test-bug-657695-resolver-breaks-on-virtuals
new file mode 100755
index 000000000..e9b27cfcd
--- /dev/null
+++ b/test/integration/test-bug-657695-resolver-breaks-on-virtuals
@@ -0,0 +1,51 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64'
+
+insertinstalledpackage 'xserver-xorg-core' 'amd64' '2:1.7.6-2ubuntu7.10'
+for i in $(seq 1 50); do
+	insertinstalledpackage "xserver-xorg-video-driver$i" 'amd64' '1.0' 'Provides: xserver-xorg-video-6'
+done
+
+insertpackage 'unstable' 'xserver-xorg-core' 'amd64' '2:1.11.3-0ubuntu9' 'Breaks: xserver-xorg-video-6'
+
+
+setupaptarchive
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following packages will be REMOVED:
+  xserver-xorg-video-driver1 xserver-xorg-video-driver10
+  xserver-xorg-video-driver11 xserver-xorg-video-driver12
+  xserver-xorg-video-driver13 xserver-xorg-video-driver14
+  xserver-xorg-video-driver15 xserver-xorg-video-driver16
+  xserver-xorg-video-driver17 xserver-xorg-video-driver18
+  xserver-xorg-video-driver19 xserver-xorg-video-driver2
+  xserver-xorg-video-driver20 xserver-xorg-video-driver21
+  xserver-xorg-video-driver22 xserver-xorg-video-driver23
+  xserver-xorg-video-driver24 xserver-xorg-video-driver25
+  xserver-xorg-video-driver26 xserver-xorg-video-driver27
+  xserver-xorg-video-driver28 xserver-xorg-video-driver29
+  xserver-xorg-video-driver3 xserver-xorg-video-driver30
+  xserver-xorg-video-driver31 xserver-xorg-video-driver32
+  xserver-xorg-video-driver33 xserver-xorg-video-driver34
+  xserver-xorg-video-driver35 xserver-xorg-video-driver36
+  xserver-xorg-video-driver37 xserver-xorg-video-driver38
+  xserver-xorg-video-driver39 xserver-xorg-video-driver4
+  xserver-xorg-video-driver40 xserver-xorg-video-driver41
+  xserver-xorg-video-driver42 xserver-xorg-video-driver43
+  xserver-xorg-video-driver44 xserver-xorg-video-driver45
+  xserver-xorg-video-driver46 xserver-xorg-video-driver47
+  xserver-xorg-video-driver48 xserver-xorg-video-driver49
+  xserver-xorg-video-driver5 xserver-xorg-video-driver50
+  xserver-xorg-video-driver6 xserver-xorg-video-driver7
+  xserver-xorg-video-driver8 xserver-xorg-video-driver9
+The following packages will be upgraded:
+  xserver-xorg-core
+1 upgraded, 0 newly installed, 50 to remove and 0 not upgraded.
+After this operation, 2150 kB disk space will be freed.
+E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only
diff --git a/test/integration/test-conflicts-loop b/test/integration/test-conflicts-loop
new file mode 100755
index 000000000..4407fbd9d
--- /dev/null
+++ b/test/integration/test-conflicts-loop
@@ -0,0 +1,36 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture "i386"
+
+insertinstalledpackage 'openjdk-6-jre' 'i386' '6b16-1.8-0ubuntu1' 
+insertpackage 'unstable' 'openjdk-6-jre' 'i386' '6b20-1.9.8-0ubuntu1~10.04.1' 'Conflicts: openjdk-6-jre-headless (<< 6b17~pre3-1), openjdk-6-jre-lib (<< 6b17~pre3-1)'
+insertinstalledpackage 'openjdk-6-jre-lib' 'i386' '6b16-1.8-0ubuntu1' 
+insertpackage 'unstable' 'openjdk-6-jre-lib' 'i386' '6b20-1.9.8-0ubuntu1~10.04.1' 'Conflicts:  openjdk-6-jre (<< 6b17~pre3-1), openjdk-6-jre-headless (<< 6b17~pre3-1)'
+insertinstalledpackage 'openjdk-6-jre-headless' 'i386' '6b16-1.8-0ubuntu1' 
+insertpackage 'unstable' 'openjdk-6-jre-headless' 'i386' '6b20-1.9.8-0ubuntu1~10.04.1' 'Conflicts:  openjdk-6-jre (<< 6b17~pre3-1), openjdk-6-jre-lib (<< 6b17~pre3-1)'
+
+setupaptarchive
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following packages will be upgraded:
+  openjdk-6-jre openjdk-6-jre-headless openjdk-6-jre-lib
+  openjdk-6-jre-lib:i386 conflicts with openjdk-6-jre:i386
+    openjdk-6-jre:i386 conflicts with openjdk-6-jre-headless:i386
+      openjdk-6-jre-headless:i386 conflicts with openjdk-6-jre:i386
+3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Remv openjdk-6-jre [6b16-1.8-0ubuntu1]
+      openjdk-6-jre-headless:i386 conflicts with openjdk-6-jre-lib:i386
+Remv openjdk-6-jre-lib [6b16-1.8-0ubuntu1]
+Inst openjdk-6-jre-headless [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
+    openjdk-6-jre:i386 conflicts with openjdk-6-jre-lib:i386
+    openjdk-6-jre:i386 conflicts with openjdk-6-jre-lib:i386
+Inst openjdk-6-jre [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
+Inst openjdk-6-jre-lib [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
+Conf openjdk-6-jre-lib (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
+Conf openjdk-6-jre (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
+Conf openjdk-6-jre-headless (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])' aptget dist-upgrade -s -o APT::Immediate-Configure-All=true
diff --git a/test/integration/test-disappearing-packages b/test/integration/test-disappearing-packages
index 82ba9e592..d2ac4edc6 100755
--- a/test/integration/test-disappearing-packages
+++ b/test/integration/test-disappearing-packages
@@ -4,12 +4,12 @@ set -e
 TESTDIR=$(readlink -f $(dirname $0))
 . $TESTDIR/framework
 setupenvironment
-configarchitecture "i386"
+configarchitecture 'native'
 
-buildsimplenativepackage "old-pkg" "i386" "1.0" "stable"
+buildsimplenativepackage "old-pkg" "native" "1.0" "stable"
 buildsimplenativepackage "unrelated" "all" "0.5" "unstable"
 
-setupsimplenativepackage "new-pkg" "i386" "2.0" "unstable" "Provides: old-pkg
+setupsimplenativepackage "new-pkg" "native" "2.0" "unstable" "Provides: old-pkg
 Replaces: old-pkg
 Conflicts: old-pkg (<< 2.0)"
 BUILDDIR="incoming/new-pkg-2.0"
@@ -39,16 +39,16 @@ COMPAREFILE=$(mktemp)
 echo "The following package disappeared from your system as
 all files have been overwritten by other packages:
   old-pkg
-Note: This is done automatic and on purpose by dpkg." > $COMPAREFILE
+Note: This is done automatically and on purpose by dpkg." > $COMPAREFILE
 $CMD 2>&1 | tail -n 4 | diff $COMPAREFILE - && msgpass || msgfail
 rm $COMPAREFILE
 
-sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d'
+sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' -e "s#:$(getarchitecture 'native') #:native #"
 testfileequal "rootdir/var/log/apt/history.log" "
-Install: old-pkg:i386 (1.0)
+Install: old-pkg:native (1.0)
 
-Install: new-pkg:i386 (2.0, automatic)
-Upgrade: old-pkg:i386 (1.0, 2.0)
+Install: new-pkg:native (2.0, automatic)
+Upgrade: old-pkg:native (1.0, 2.0)
 Disappeared: old-pkg (1.0)"
 
 testmarkedauto  # new-pkg should have get the manual flag from old-pkg
diff --git a/test/integration/test-dpkg-assert-multi-arch b/test/integration/test-dpkg-assert-multi-arch
new file mode 100755
index 000000000..177d7489b
--- /dev/null
+++ b/test/integration/test-dpkg-assert-multi-arch
@@ -0,0 +1,97 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64' 'i386'
+
+buildsimplenativepackage 'native-pkg' 'amd64' '1.0' 'stable'
+buildsimplenativepackage 'foreign-pkg' 'i386' '0.5' 'stable' 'Multi-Arch: foreign'
+buildsimplenativepackage 'same-lib' 'amd64,i386' '0.5' 'stable' 'Multi-Arch: same'
+buildsimplenativepackage 'all-pkg' 'all' '2.0' 'stable'
+buildsimplenativepackage 'all-foreign-pkg' 'all' '2.0' 'stable' 'Multi-Arch: foreign'
+
+setupaptarchive
+
+testqualifier() {
+	msgtest 'Test with' $1 'for correct qualifier mode' $2
+	GIVEN="$(aptget install $1 -qq -o Debug::pkgDPkgPM=1 2>&1 | grep -v -- '--unpack' | sed -e 's/^.*--[^u][^ ]* \([^ ]*\).*$/\1/')"
+	if [ "$GIVEN" = "$2" ]; then
+		msgpass
+	else
+		echo
+		echo "$GIVEN"
+		msgfail
+	fi
+}
+
+# non-multiarch or "ubuntus" old multiarchified dpkg
+echo 'Dir::Bin::dpkg "./dpkg-wrapper";' > rootdir/etc/apt/apt.conf.d/99dpkgwrapper
+echo '#! /bin/sh
+if echo "$*" | grep -q -- "--assert-multi-arch"; then
+	echo >&2 'dpkg: Fehler: unbekannte Option --assert-multi-arch'
+	echo >&1 'dpkg: Info: unbekannte Option --assert-multi-arch'
+	return 2;
+fi
+return $*' > ./dpkg-wrapper
+chmod +x ./dpkg-wrapper
+
+testqualifier 'native-pkg' 'native-pkg'
+testqualifier 'native-pkg:amd64' 'native-pkg'
+testqualifier 'foreign-pkg' 'foreign-pkg:i386'
+testqualifier 'foreign-pkg:i386' 'foreign-pkg:i386'
+testqualifier 'same-lib' 'same-lib'
+testqualifier 'same-lib:amd64' 'same-lib'
+testqualifier 'same-lib:i386' 'same-lib:i386'
+testqualifier 'all-pkg' 'all-pkg'
+testqualifier 'all-pkg:amd64' 'all-pkg'
+testqualifier 'all-foreign-pkg' 'all-foreign-pkg'
+testqualifier 'all-foreign-pkg:amd64' 'all-foreign-pkg'
+insertinstalledpackage 'all-pkg' 'amd64' '1.0'
+insertinstalledpackage 'all-foreign-pkg' 'amd64' '1.0' 'Multi-Arch: foreign'
+testqualifier 'all-pkg' 'all-pkg'
+testqualifier 'all-pkg:amd64' 'all-pkg'
+testqualifier 'all-foreign-pkg' 'all-foreign-pkg'
+testqualifier 'all-foreign-pkg:amd64' 'all-foreign-pkg'
+insertinstalledpackage 'always-all-pkg' 'all' '1.0'
+insertinstalledpackage 'always-all-foreign-pkg' 'all' '1.0' 'Multi-Arch: foreign'
+testqualifier 'all-pkg-' 'all-pkg'
+testqualifier 'all-foreign-pkg-' 'all-foreign-pkg'
+testqualifier 'always-all-pkg-' 'always-all-pkg'
+testqualifier 'always-all-foreign-pkg-' 'always-all-foreign-pkg'
+
+# multiarch dpkg (new interface version)
+
+rm rootdir/var/lib/dpkg/status
+touch rootdir/var/lib/dpkg/status
+echo 'Dir::Bin::dpkg "./dpkg-wrapper";' > rootdir/etc/apt/apt.conf.d/99dpkgwrapper
+echo '#! /bin/sh
+if echo "$*" | grep -q -- "--assert-multi-arch"; then
+	return 0;
+fi
+return $*' > ./dpkg-wrapper
+
+testqualifier 'native-pkg' 'native-pkg:amd64'
+testqualifier 'native-pkg:amd64' 'native-pkg:amd64'
+testqualifier 'foreign-pkg' 'foreign-pkg:i386'
+testqualifier 'foreign-pkg:i386' 'foreign-pkg:i386'
+testqualifier 'same-lib' 'same-lib:amd64'
+testqualifier 'same-lib:amd64' 'same-lib:amd64'
+testqualifier 'same-lib:i386' 'same-lib:i386'
+testqualifier 'all-pkg' 'all-pkg:all'
+testqualifier 'all-pkg:amd64' 'all-pkg:all'
+testqualifier 'all-foreign-pkg' 'all-foreign-pkg:all'
+testqualifier 'all-foreign-pkg:amd64' 'all-foreign-pkg:all'
+insertinstalledpackage 'all-pkg' 'amd64' '1.0'
+insertinstalledpackage 'all-foreign-pkg' 'amd64' '1.0' 'Multi-Arch: foreign'
+testqualifier 'all-pkg' 'all-pkg:all'
+testqualifier 'all-pkg:amd64' 'all-pkg:all'
+testqualifier 'all-foreign-pkg' 'all-foreign-pkg:all'
+testqualifier 'all-foreign-pkg:amd64' 'all-foreign-pkg:all'
+insertinstalledpackage 'always-all-pkg' 'all' '1.0'
+insertinstalledpackage 'always-all-foreign-pkg' 'all' '1.0' 'Multi-Arch: foreign'
+testqualifier 'all-pkg-' 'all-pkg:amd64'
+testqualifier 'all-foreign-pkg-' 'all-foreign-pkg:amd64'
+testqualifier 'always-all-pkg-' 'always-all-pkg:all'
+testqualifier 'always-all-foreign-pkg-' 'always-all-foreign-pkg:all'
diff --git a/test/integration/test-handling-broken-orgroups b/test/integration/test-handling-broken-orgroups
index d88ad0000..20b314074 100755
--- a/test/integration/test-handling-broken-orgroups
+++ b/test/integration/test-handling-broken-orgroups
@@ -58,7 +58,7 @@ The following information may help to resolve the situation:
 The following packages have unmet dependencies:
  coolstuff-broken : Depends: cool2 but it is not installable or
                              stuff2 but it is not installable
-E: Broken packages' aptget install coolstuff-broken -s
+E: Unable to correct problems, you have held broken packages.' aptget install coolstuff-broken -s
 
 testequal 'Reading package lists...
 Building dependency tree...
@@ -105,4 +105,4 @@ The following information may help to resolve the situation:
 The following packages have unmet dependencies:
  coolstuff-provided-broken : Depends: cool2 but it is not installable or
                                       stuff-abi-2
-E: Broken packages' aptget install coolstuff-provided-broken -s
+E: Unable to correct problems, you have held broken packages.' aptget install coolstuff-provided-broken -s
diff --git a/test/integration/test-hashsum-verification b/test/integration/test-hashsum-verification
index 3ac9eccfb..99ea8bffa 100755
--- a/test/integration/test-hashsum-verification
+++ b/test/integration/test-hashsum-verification
@@ -23,7 +23,7 @@ prepare() {
 	find aptarchive -name 'Release' -delete
 	cat aptarchive/Packages | gzip > aptarchive/Packages.gz
 	cat aptarchive/Packages | bzip2 > aptarchive/Packages.bz2
-	cat aptarchive/Packages | lzma > aptarchive/Packages.lzma
+	cat aptarchive/Packages | xz --format=lzma > aptarchive/Packages.lzma
         # create Release file with incorret checksums
 	cat > aptarchive/Release <<EOF
 Date: Fri, 05 Aug 2011 09:22:08 UTC
diff --git a/test/integration/test-implicit-conflicts-real-not-virtual b/test/integration/test-implicit-conflicts-real-not-virtual
new file mode 100755
index 000000000..c9fca4edf
--- /dev/null
+++ b/test/integration/test-implicit-conflicts-real-not-virtual
@@ -0,0 +1,56 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64' 'i386'
+
+insertpackage 'unstable-mp' 'crda' 'i386,amd64' '1.1.1-1ubuntu4mp' 'Provides: wireless-crda
+Multi-Arch: foreign'
+insertpackage 'unstable-m' 'crda' 'i386,amd64' '1.1.1-1ubuntu4m' 'Multi-Arch: foreign'
+insertpackage 'unstable-p' 'crda' 'i386,amd64' '1.1.1-1ubuntu4p' 'Provides: wireless-crda'
+insertpackage 'unstable' 'wireless-crda' 'i386,amd64' '1.16'
+
+
+insertinstalledpackage 'wireless-crda' 'amd64' '1.14'
+
+setupaptarchive
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  crda
+0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
+Inst crda (1.1.1-1ubuntu4m unstable-m [amd64])
+Conf crda (1.1.1-1ubuntu4m unstable-m [amd64])' aptget install crda -s -t unstable-m
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  crda
+0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
+Inst crda (1.1.1-1ubuntu4p unstable-p [amd64])
+Conf crda (1.1.1-1ubuntu4p unstable-p [amd64])' aptget install crda -s -t unstable-p
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  crda
+0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
+Inst crda (1.1.1-1ubuntu4mp unstable-mp [amd64])
+Conf crda (1.1.1-1ubuntu4mp unstable-mp [amd64])' aptget install crda -s -t unstable-mp
+
+rm rootdir/var/lib/dpkg/status
+insertinstalledpackage 'crda' 'amd64' '1.1.1-1ubuntu4mp' 'Provides: wireless-crda
+Conflicts: wireless-crda (<< 1.15)
+Replaces: wireless-crda ( << 1.15)
+Multi-arch: foreign'
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  wireless-crda
+0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
+Inst wireless-crda (1.16 unstable [amd64])
+Conf wireless-crda (1.16 unstable [amd64])' aptget install wireless-crda -s -t unstable
diff --git a/test/integration/test-multiarch-foreign b/test/integration/test-multiarch-foreign
new file mode 100755
index 000000000..332466d96
--- /dev/null
+++ b/test/integration/test-multiarch-foreign
@@ -0,0 +1,150 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64' 'i386' 'armel'
+
+insertpackage 'unstable' 'cool-foo' 'amd64,i386' '1.0' 'Depends: foo'
+insertpackage 'unstable' 'foo' 'amd64,i386,armel' '1.0' 'Multi-Arch: foreign'
+
+insertpackage 'unstable' 'cool-bar' 'amd64,i386' '1.0' 'Depends: bar-provider'
+insertpackage 'unstable' 'bar' 'amd64,i386,armel' '1.0' 'Provides: bar-provider
+Multi-Arch: foreign'
+
+setupaptarchive
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+  foo
+The following NEW packages will be installed:
+  cool-foo:i386 foo
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1.0 unstable [amd64])
+Inst cool-foo:i386 (1.0 unstable [i386])
+Conf foo (1.0 unstable [amd64])
+Conf cool-foo:i386 (1.0 unstable [i386])' aptget install cool-foo:i386 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+  foo
+The following NEW packages will be installed:
+  cool-foo foo
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1.0 unstable [amd64])
+Inst cool-foo (1.0 unstable [amd64])
+Conf foo (1.0 unstable [amd64])
+Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  cool-foo foo
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1.0 unstable [amd64])
+Inst cool-foo (1.0 unstable [amd64])
+Conf foo (1.0 unstable [amd64])
+Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 foo:amd64 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  cool-foo foo:i386
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst foo:i386 (1.0 unstable [i386])
+Inst cool-foo (1.0 unstable [amd64])
+Conf foo:i386 (1.0 unstable [i386])
+Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 foo:i386 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  cool-foo foo:armel
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst foo:armel (1.0 unstable [armel])
+Inst cool-foo (1.0 unstable [amd64])
+Conf foo:armel (1.0 unstable [armel])
+Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 foo:armel -s
+
+
+
+
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+  bar
+The following NEW packages will be installed:
+  bar cool-bar:i386
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst bar (1.0 unstable [amd64])
+Inst cool-bar:i386 (1.0 unstable [i386])
+Conf bar (1.0 unstable [amd64])
+Conf cool-bar:i386 (1.0 unstable [i386])' aptget install cool-bar:i386 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+  bar
+The following NEW packages will be installed:
+  bar cool-bar
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst bar (1.0 unstable [amd64])
+Inst cool-bar (1.0 unstable [amd64])
+Conf bar (1.0 unstable [amd64])
+Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  bar cool-bar
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst bar (1.0 unstable [amd64])
+Inst cool-bar (1.0 unstable [amd64])
+Conf bar (1.0 unstable [amd64])
+Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 bar:amd64 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  bar:i386 cool-bar
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst bar:i386 (1.0 unstable [i386])
+Inst cool-bar (1.0 unstable [amd64])
+Conf bar:i386 (1.0 unstable [i386])
+Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 bar:i386 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  bar:armel cool-bar
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst bar:armel (1.0 unstable [armel])
+Inst cool-bar (1.0 unstable [amd64])
+Conf bar:armel (1.0 unstable [armel])
+Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 bar:armel -s
+
+testequal "Reading package lists...
+Building dependency tree...
+Note, selecting 'bar' instead of 'bar-provider'
+The following NEW packages will be installed:
+  bar cool-bar
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst bar (1.0 unstable [amd64])
+Inst cool-bar (1.0 unstable [amd64])
+Conf bar (1.0 unstable [amd64])
+Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider -s -q=0
+
+testequal "Reading package lists...
+Building dependency tree...
+Note, selecting 'bar:i386' instead of 'bar-provider:i386'
+The following NEW packages will be installed:
+  bar:i386 cool-bar
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst bar:i386 (1.0 unstable [i386])
+Inst cool-bar (1.0 unstable [amd64])
+Conf bar:i386 (1.0 unstable [i386])
+Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider:i386 -s -q=0
diff --git a/test/integration/test-ordering-ignore-not-matching-breaks b/test/integration/test-ordering-ignore-not-matching-breaks
new file mode 100755
index 000000000..c9fca4edf
--- /dev/null
+++ b/test/integration/test-ordering-ignore-not-matching-breaks
@@ -0,0 +1,56 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64' 'i386'
+
+insertpackage 'unstable-mp' 'crda' 'i386,amd64' '1.1.1-1ubuntu4mp' 'Provides: wireless-crda
+Multi-Arch: foreign'
+insertpackage 'unstable-m' 'crda' 'i386,amd64' '1.1.1-1ubuntu4m' 'Multi-Arch: foreign'
+insertpackage 'unstable-p' 'crda' 'i386,amd64' '1.1.1-1ubuntu4p' 'Provides: wireless-crda'
+insertpackage 'unstable' 'wireless-crda' 'i386,amd64' '1.16'
+
+
+insertinstalledpackage 'wireless-crda' 'amd64' '1.14'
+
+setupaptarchive
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  crda
+0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
+Inst crda (1.1.1-1ubuntu4m unstable-m [amd64])
+Conf crda (1.1.1-1ubuntu4m unstable-m [amd64])' aptget install crda -s -t unstable-m
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  crda
+0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
+Inst crda (1.1.1-1ubuntu4p unstable-p [amd64])
+Conf crda (1.1.1-1ubuntu4p unstable-p [amd64])' aptget install crda -s -t unstable-p
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  crda
+0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
+Inst crda (1.1.1-1ubuntu4mp unstable-mp [amd64])
+Conf crda (1.1.1-1ubuntu4mp unstable-mp [amd64])' aptget install crda -s -t unstable-mp
+
+rm rootdir/var/lib/dpkg/status
+insertinstalledpackage 'crda' 'amd64' '1.1.1-1ubuntu4mp' 'Provides: wireless-crda
+Conflicts: wireless-crda (<< 1.15)
+Replaces: wireless-crda ( << 1.15)
+Multi-arch: foreign'
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  wireless-crda
+0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
+Inst wireless-crda (1.16 unstable [amd64])
+Conf wireless-crda (1.16 unstable [amd64])' aptget install wireless-crda -s -t unstable
diff --git a/test/integration/test-package-reinstallation b/test/integration/test-package-reinstallation
new file mode 100755
index 000000000..b4f2061ec
--- /dev/null
+++ b/test/integration/test-package-reinstallation
@@ -0,0 +1,23 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture "i386"
+
+insertinstalledpackage 'libc-bin' 'i386' '2.13-8' 'Replaces: libc6'
+insertpackage 'unstable' 'libc-bin' 'i386' '2.13-8' 'Replaces: libc6'
+insertinstalledpackage 'libc6' 'i386' '2.13-8' 'Depends: libc-bin (= 2.13-8)'
+insertpackage 'unstable' 'libc6' 'i386' '2.13-8' 'Depends: libc-bin (= 2.13-8)'
+insertinstalledpackage 'apt' 'i386' '0.8.15' 'Depends: libc6'
+
+setupaptarchive
+
+testequal 'Reading package lists...
+Building dependency tree...
+0 upgraded, 0 newly installed, 2 reinstalled, 0 to remove and 0 not upgraded.
+Inst libc-bin [2.13-8] (2.13-8 unstable [i386])
+Conf libc-bin (2.13-8 unstable [i386])
+Inst libc6 [2.13-8] (2.13-8 unstable [i386])
+Conf libc6 (2.13-8 unstable [i386])' aptget install --reinstall libc6 libc-bin -s
diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage
index 0a8293018..29301d07d 100755
--- a/test/integration/test-pdiff-usage
+++ b/test/integration/test-pdiff-usage
@@ -21,7 +21,7 @@ testequal "$(cat ${PKGFILE})
 cp ${PKGFILE}-new aptarchive/Packages
 cat aptarchive/Packages | gzip > aptarchive/Packages.gz
 cat aptarchive/Packages | bzip2 > aptarchive/Packages.bz2
-cat aptarchive/Packages | lzma > aptarchive/Packages.lzma
+cat aptarchive/Packages | xz --format=lzma > aptarchive/Packages.lzma
 rm -rf aptarchive/Packages.diff
 mkdir -p aptarchive/Packages.diff
 PATCHFILE="aptarchive/Packages.diff/$(date +%Y-%m-%d-%H%M.%S)"
diff --git a/test/integration/test-pin-non-existent-package b/test/integration/test-pin-non-existent-package
index c91e77844..35de22115 100755
--- a/test/integration/test-pin-non-existent-package
+++ b/test/integration/test-pin-non-existent-package
@@ -6,7 +6,7 @@ TESTDIR=$(readlink -f $(dirname $0))
 setupenvironment
 configarchitecture "i386"
 
-insertpackage 'unstable' 'apt' 'i386' '0.8.15'
+insertpackage 'unstable' 'rapt' 'i386' '0.8.15'
 insertpackage 'unstable' 'arch' 'i386' '1.0'
 
 setupaptarchive
@@ -22,40 +22,40 @@ testcandidate() {
 	fi
 }
 
-testcandidate apt '0.8.15'
+testcandidate rapt '0.8.15'
 testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
 testequal 'Reading package lists...
 Building dependency tree...
-0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only
 
-echo 'Package: apt
+echo 'Package: rapt
 Pin: release a=unstable
 Pin-Priority: -1' > rootdir/etc/apt/preferences
 
-testcandidate apt '(none)'
+testcandidate rapt '(none)'
 testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
 testequal 'Reading package lists...
 Building dependency tree...
-0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only
 
 echo '
 Package: doesntexist
 Pin: release a=unstable
 Pin-Priority: 1000' >> rootdir/etc/apt/preferences
 
-testcandidate apt '(none)'
+testcandidate rapt '(none)'
 
 echo '
-Package: apt
+Package: rapt
 Pin: release a=unstable
 Pin-Priority: 1000' >> rootdir/etc/apt/preferences
 
-testcandidate apt '(none)'
+testcandidate rapt '(none)'
 testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
 
 testequal 'Reading package lists...
 Building dependency tree...
-0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only
 
 echo 'Package: arch:amd64
 Pin: release a=unstable
diff --git a/test/integration/test-provides-gone-with-upgrade b/test/integration/test-provides-gone-with-upgrade
new file mode 100755
index 000000000..70384ce29
--- /dev/null
+++ b/test/integration/test-provides-gone-with-upgrade
@@ -0,0 +1,26 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture "i386"
+
+insertinstalledpackage 'apt' 'i386' '0.8.14' 'Provides: libapt-pkg4.10'
+insertpackage 'unstable' 'apt' 'i386' '0.8.15' 'Depends: libapt-pkg4.10'
+insertpackage 'unstable' 'libapt-pkg4.10' 'i386' '0.8.15' 'Breaks: apt (<< 0.8.15)
+Replaces: apt (<< 0.8.15)'
+
+setupaptarchive
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  libapt-pkg4.10
+The following packages will be upgraded:
+  apt
+1 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst apt [0.8.14] (0.8.15 unstable [i386]) []
+Inst libapt-pkg4.10 (0.8.15 unstable [i386])
+Conf libapt-pkg4.10 (0.8.15 unstable [i386])
+Conf apt (0.8.15 unstable [i386])' aptget dist-upgrade -s
diff --git a/test/integration/test-release-candidate-switching b/test/integration/test-release-candidate-switching
index b6dbe99db..0970cb935 100755
--- a/test/integration/test-release-candidate-switching
+++ b/test/integration/test-release-candidate-switching
@@ -416,4 +416,4 @@ The following information may help to resolve the situation:
 The following packages have unmet dependencies:
  uninstallablepkg : Depends: libmtp8 (>= 10:0.20.1) but it is not going to be installed
                     Depends: amarok-utils (= 2.3.2-2+exp) but 2.3.1-1+sid is to be installed
-E: Broken packages" aptget install uninstallablepkg/experimental --trivial-only -V -q=0
+E: Unable to correct problems, you have held broken packages." aptget install uninstallablepkg/experimental --trivial-only -V -q=0
diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification
index 4f65cfa3b..d3ea91de5 100755
--- a/test/integration/test-releasefile-verification
+++ b/test/integration/test-releasefile-verification
@@ -24,7 +24,7 @@ prepare() {
 	find aptarchive -name 'Release' -delete
 	cat aptarchive/Packages | gzip > aptarchive/Packages.gz
 	cat aptarchive/Packages | bzip2 > aptarchive/Packages.bz2
-	cat aptarchive/Packages | lzma > aptarchive/Packages.lzma
+	cat aptarchive/Packages | xz --format=lzma > aptarchive/Packages.lzma
 	generatereleasefiles "$DATE"
 }
 
diff --git a/test/integration/test-suggest-installed-multiarch-silbing b/test/integration/test-suggest-installed-multiarch-silbing
new file mode 100755
index 000000000..d55d250aa
--- /dev/null
+++ b/test/integration/test-suggest-installed-multiarch-silbing
@@ -0,0 +1,80 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64' 'i386' 'armel'
+
+insertinstalledpackage 'foo' 'i386' '1'
+insertpackage 'unstable' 'foo' 'amd64,i386' '1'
+
+insertinstalledpackage 'foo2' 'i386' '1'
+insertpackage 'unstable' 'foo2' 'i386' '1'
+
+insertinstalledpackage 'foo3' 'amd64' '1'
+insertpackage 'unstable' 'foo3' 'amd64,i386' '1'
+
+insertinstalledpackage 'samefoo' 'i386,amd64' '1' 'Multi-Arch: same'
+insertpackage 'unstable' 'samefoo' 'amd64,i386,armel' '1' 'Multi-Arch: same'
+
+insertinstalledpackage 'samefoo2' 'i386' '1' 'Multi-Arch: same'
+insertpackage 'unstable' 'samefoo2' 'amd64,i386,armel' '1' 'Multi-Arch: same'
+
+insertinstalledpackage 'mozplugger' 'i386' '1' 'Depends: iceweasel | fireweasel'
+insertinstalledpackage 'fireweasel' 'i386' '1'
+insertpackage 'unstable' 'mozplugger' 'i386,amd64' '1' 'Depends: iceweasel | fireweasel'
+
+setupaptarchive
+
+testequal "Reading package lists...
+Building dependency tree...
+Package 'foo' is not installed, so not removed. Did you mean 'foo:i386'?
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget remove foo -s
+
+testequal "Reading package lists...
+Building dependency tree...
+The following packages will be REMOVED:
+  foo2:i386
+0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded.
+Remv foo2:i386 [1]" aptget remove foo2 -s
+
+testequal "Reading package lists...
+Building dependency tree...
+The following packages will be REMOVED:
+  foo3
+0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded.
+Remv foo3 [1]" aptget remove foo3 -s
+
+testequal "Reading package lists...
+Building dependency tree...
+Package 'foo3:i386' is not installed, so not removed. Did you mean 'foo3'?
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget remove foo3:i386 -s
+
+testequalor2 "Reading package lists...
+Building dependency tree...
+Package 'samefoo:armel' is not installed, so not removed. Did you mean 'samefoo'?
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." "Reading package lists...
+Building dependency tree...
+Package 'samefoo:armel' is not installed, so not removed. Did you mean 'samefoo:i386'?
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget remove samefoo:armel -s
+
+testequal "Reading package lists...
+Building dependency tree...
+Package 'samefoo2' is not installed, so not removed. Did you mean 'samefoo2:i386'?
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget remove samefoo2 -s
+
+testequal "Reading package lists...
+Building dependency tree...
+Package 'samefoo2:armel' is not installed, so not removed. Did you mean 'samefoo2:i386'?
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget remove samefoo2:armel -s
+
+testequal "Reading package lists...
+Building dependency tree...
+Package 'iceweasel' is not installed, so not removed
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget remove iceweasel -s
+
+testequal "Reading package lists...
+Building dependency tree...
+Package 'fireweasel' is not installed, so not removed. Did you mean 'fireweasel:i386'?
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget remove fireweasel:amd64 -s
diff --git a/test/integration/test-ubuntu-bug-761175-remove-purge b/test/integration/test-ubuntu-bug-761175-remove-purge
index 93b67fc02..f55c6e909 100755
--- a/test/integration/test-ubuntu-bug-761175-remove-purge
+++ b/test/integration/test-ubuntu-bug-761175-remove-purge
@@ -4,14 +4,14 @@ set -e
 TESTDIR=$(readlink -f $(dirname $0))
 . $TESTDIR/framework
 setupenvironment
-configarchitecture 'i386'
+configarchitecture 'native'
 
-setupsimplenativepackage 'compiz-core' 'i386' '1.0' 'unstable'
+setupsimplenativepackage 'compiz-core' 'native' '1.0' 'unstable'
 BUILDDIR='incoming/compiz-core-1.0'
 mkdir -p ${BUILDDIR}/debian/compiz-core/etc
 echo 'foo=bar;' > ${BUILDDIR}/compiz.conf
 echo 'compiz.conf	/etc/compiz.conf' >> ${BUILDDIR}/debian/install
-buildpackage "$BUILDDIR" 'unstable' 'main'
+buildpackage "$BUILDDIR" 'unstable' 'main' 'native'
 rm -rf "$BUILDDIR"
 
 setupaptarchive
@@ -27,7 +27,7 @@ aptget remove compiz-core -y -qq 2>&1 >/dev/null && msgpass || msgfail
 testdpkgnotinstalled compiz-core
 
 msgtest 'Check that conffiles are still around for' 'compiz-core'
-dpkg -l compiz-core | grep '^rc' 2>&1 >/dev/null && msgpass || msgfail
+dpkg -l compiz-core | grep -q '^rc' && msgpass || msgfail
 
 testequal 'Reading package lists...
 Building dependency tree...
diff --git a/test/integration/test-ubuntu-bug-859188-multiarch-reinstall b/test/integration/test-ubuntu-bug-859188-multiarch-reinstall
new file mode 100755
index 000000000..0fdf97485
--- /dev/null
+++ b/test/integration/test-ubuntu-bug-859188-multiarch-reinstall
@@ -0,0 +1,28 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64' 'i386' 'armel'
+
+buildsimplenativepackage 'libsame' 'amd64,i386,armel' '1.0' 'unstable' 'Multi-Arch: same'
+
+# FIXME: hack around dpkg's current inability to handle multiarch, a clean install would be better…
+insertinstalledpackage 'libsame' 'amd64,i386' '1.0' 'Multi-Arch: same'
+sed -e 's#/installed#/unstable#' -e 's#Installed-Size: 42#Installed-Size: 1#' -i rootdir/var/lib/dpkg/status
+
+setupaptarchive
+
+REINSTALL='Reading package lists...
+Building dependency tree...
+0 upgraded, 0 newly installed, 2 reinstalled, 0 to remove and 0 not upgraded.
+Inst libsame [1.0] (1.0 unstable [amd64])
+Inst libsame:i386 [1.0] (1.0 unstable [i386])
+Conf libsame (1.0 unstable [amd64])
+Conf libsame:i386 (1.0 unstable [i386])'
+
+testequal "$REINSTALL" aptget install --reinstall libsame -s
+testequal "$REINSTALL" aptget install --reinstall libsame:amd64 -s
+testequal "$REINSTALL" aptget install --reinstall libsame:i386 -s
+testequal "$REINSTALL" aptget install --reinstall libsame:amd64 libsame:i386 -s
diff --git a/test/interactive-helper/extract-control.cc b/test/interactive-helper/extract-control.cc
index 29dcbf371..3f7feabcb 100644
--- a/test/interactive-helper/extract-control.cc
+++ b/test/interactive-helper/extract-control.cc
@@ -1,5 +1,6 @@
 #include <apt-pkg/debfile.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
 
 #include <iostream>
 #include <unistd.h>
@@ -20,8 +21,7 @@ bool ExtractMember(const char *File,const char *Member)
    if (Extract.Control == 0)
       return true;
    
-   write(STDOUT_FILENO,Extract.Control,Extract.Length);
-   return true;
+   return write(STDOUT_FILENO,Extract.Control,Extract.Length) != -1;
 }
 
 int main(int argc, const char *argv[])
diff --git a/test/interactive-helper/makefile b/test/interactive-helper/makefile
index b96139fda..10d1e44ec 100644
--- a/test/interactive-helper/makefile
+++ b/test/interactive-helper/makefile
@@ -11,28 +11,24 @@ SLIBS =
 SOURCE = mthdcat.cc
 include $(PROGRAM_H)
 
-# Version compare tester
-PROGRAM=testextract
-SLIBS = -lapt-pkg -lapt-inst
-LIB_MAKES = apt-pkg/makefile apt-inst/makefile
-SOURCE = testextract.cc
-include $(PROGRAM_H)
-
 # Program for testing the tar/deb extractor
 PROGRAM=testdeb
 SLIBS = -lapt-pkg -lapt-inst
+LIB_MAKES = apt-pkg/makefile apt-inst/makefile
 SOURCE = testdeb.cc
 include $(PROGRAM_H)
 
 # Program for testing tar extraction
 PROGRAM=extract-control
 SLIBS = -lapt-pkg -lapt-inst
+LIB_MAKES = apt-pkg/makefile apt-inst/makefile
 SOURCE = extract-control.cc
 include $(PROGRAM_H)
 
 # Program for testing udevcdrom
 PROGRAM=test_udevcdrom
-SLIBS = -lapt-pkg 
+SLIBS = -lapt-pkg
+LIB_MAKES = apt-pkg/makefile
 SOURCE = test_udevcdrom.cc
 include $(PROGRAM_H)
 
diff --git a/test/interactive-helper/test_udevcdrom.cc b/test/interactive-helper/test_udevcdrom.cc
index dc25ab357..88f5f0153 100644
--- a/test/interactive-helper/test_udevcdrom.cc
+++ b/test/interactive-helper/test_udevcdrom.cc
@@ -2,12 +2,15 @@
 #include <stdio.h>
 #include <assert.h>
 
+#include <vector>
+#include <iostream>
+
 int main()
 {
    pkgUdevCdromDevices c;
    assert(c.Dlopen());
 
-   vector<CdromDevice> l;
+   std::vector<CdromDevice> l;
    l = c.Scan();
    assert(l.empty() == false);
    for (size_t i = 0; i < l.size(); ++i)
diff --git a/test/interactive-helper/testextract.cc b/test/interactive-helper/testextract.cc
deleted file mode 100644
index b790df618..000000000
--- a/test/interactive-helper/testextract.cc
+++ /dev/null
@@ -1,101 +0,0 @@
-#include <apt-pkg/dpkgdb.h>
-#include <apt-pkg/debfile.h>
-#include <apt-pkg/error.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/extract.h>
-#include <apt-pkg/init.h>
-#include <apt-pkg/strutl.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-using namespace std;
-
-bool Go(int argc,char *argv[])
-{
-   // Init the database
-   debDpkgDB Db;   
-   {
-      OpTextProgress Prog;
-
-      if (Db.ReadyPkgCache(Prog) == false)
-	 return false;
-      Prog.Done();
-      
-      if (Db.ReadyFileList(Prog) == false)
-	 return false;
-   }
-
-   for (int I = 1; I < argc; I++)
-   {
-      const char *Fake = 0;
-      for (unsigned J = 0; argv[I][J] != 0; J++)
-      {
-	 if (argv[I][J] != ',')
-	    continue;
-	 Fake = argv[I] + J + 1;
-	 argv[I][J] = 0;
-      }
-      
-      FileFd F(argv[I],FileFd::ReadOnly);
-      debDebFile Deb(F);
-
-      if (_error->PendingError() == true)
-	 return false;
-      
-      if (Deb.ExtractControl(Db) == false)
-	 return false;
-      cout << argv[I] << endl;
-      
-      pkgCache::VerIterator Ver = Deb.MergeControl(Db);
-      if (Ver.end() == true)
-	 return false;
-      
-      cout << Ver.ParentPkg().Name() << ' ' << Ver.VerStr() << endl;
-      
-      pkgExtract Extract(Db.GetFLCache(),Ver);
-      
-      if (Fake != 0)
-      {
-	 pkgExtract::Item Itm;
-	 memset(&Itm,0,sizeof(Itm));
-	 FILE *F = fopen(Fake,"r");
-	 while (feof(F) == 0)
-	 {
-	    char Line[300];
-	    fgets(Line,sizeof(Line),F);
-	    Itm.Name = _strstrip(Line);
-	    Itm.Type = pkgDirStream::Item::File;
-	    if (Line[strlen(Line)-1] == '/')
-	       Itm.Type = pkgDirStream::Item::Directory;
-
-	    int Fd;
-	    if (Extract.DoItem(Itm,Fd) == false) {
-	       fclose(F);
-	       return false;
-	    }
-	 }
-	 fclose(F);
-      }
-      else
-	 if (Deb.ExtractArchive(Extract) == false)
-	    return false;
-   }
-   return true;
-}
-
-int main(int argc,char *argv[])
-{
-   pkgInitConfig(*_config);
-   pkgInitSystem(*_config,_system);
-   _config->Set("Dir::State::status","/tmp/testing/status");
-
-   Go(argc,argv);
-   
-   if (_error->PendingError() == true)
-   {
-      _error->DumpErrors();
-      return 0;
-   }
-}
diff --git a/test/libapt/assert.h b/test/libapt/assert.h
index ce5accc1c..a07be4b57 100644
--- a/test/libapt/assert.h
+++ b/test/libapt/assert.h
@@ -26,6 +26,18 @@ void assertEquals(int const &expect, unsigned int const &get, unsigned long cons
 	assertEquals<unsigned int const&, unsigned int const&>(expect, get, line);
 }
 
+void assertEquals(unsigned long const &expect, int const &get, unsigned long const &line) {
+	if (get < 0)
+		OutputAssertEqual(expect, "==", get, line);
+	assertEquals<unsigned long const&, unsigned long const&>(expect, get, line);
+}
+
+void assertEquals(int const &expect, unsigned long const &get, unsigned long const &line) {
+	if (expect < 0)
+		OutputAssertEqual(expect, "==", get, line);
+	assertEquals<unsigned long const&, unsigned long const&>(expect, get, line);
+}
+
 
 #define equalsOr2(x,y,z) assertEqualsOr2(y, z, x, __LINE__)
 
diff --git a/test/libapt/cdromfindpackages_test.cc b/test/libapt/cdromfindpackages_test.cc
new file mode 100644
index 000000000..e9f5a51b0
--- /dev/null
+++ b/test/libapt/cdromfindpackages_test.cc
@@ -0,0 +1,86 @@
+#include <apt-pkg/cdrom.h>
+#include <apt-pkg/error.h>
+
+#include <algorithm>
+#include <string>
+#include <vector>
+
+#include "assert.h"
+
+class Cdrom : public pkgCdrom {
+	public:
+	bool FindPackages(std::string const &CD,
+			  std::vector<std::string> &List,
+			  std::vector<std::string> &SList,
+			  std::vector<std::string> &SigList,
+			  std::vector<std::string> &TransList,
+			  std::string &InfoDir) {
+		bool const result = pkgCdrom::FindPackages(CD, List, SList, SigList, TransList, InfoDir, NULL, 0);
+		std::sort(List.begin(), List.end());
+		std::sort(SList.begin(), SList.end());
+		std::sort(SigList.begin(), SigList.end());
+		std::sort(TransList.begin(), TransList.end());
+		return result;
+	}
+
+	bool DropRepeats(std::vector<std::string> &List, char const *Name) {
+		return pkgCdrom::DropRepeats(List, Name);
+	}
+};
+
+int main(int argc, char const *argv[]) {
+	if (argc != 2) {
+		std::cout << "One parameter expected - given " << argc << std::endl;
+		return 100;
+	}
+
+	Cdrom cd;
+	std::vector<std::string> Packages, Sources, Signatur, Translation;
+	std::string InfoDir;
+	std::string path = argv[1];
+	equals(true, cd.FindPackages(path, Packages, Sources, Signatur, Translation, InfoDir));
+	equals(4, Packages.size());
+	equals(path + "/dists/sid/main/binary-i386/", Packages[0]);
+	equals(path + "/dists/stable/contrib/binary-amd64/", Packages[1]);
+	equals(path + "/dists/stable/main/binary-i386/", Packages[2]);
+	equals(path + "/dists/unstable/main/binary-i386/", Packages[3]);
+	equals(3, Sources.size());
+	equals(path + "/dists/sid/main/source/", Sources[0]);
+	equals(path + "/dists/stable/main/source/", Sources[1]);
+	equals(path + "/dists/unstable/main/source/", Sources[2]);
+	equals(3, Signatur.size());
+	equals(path + "/dists/sid/", Signatur[0]);
+	equals(path + "/dists/stable/", Signatur[1]);
+	equals(path + "/dists/unstable/", Signatur[2]);
+	equals(4, Translation.size());
+	equals(path + "/dists/sid/main/i18n/Translation-de", Translation[0]);
+	equals(path + "/dists/sid/main/i18n/Translation-en", Translation[1]);
+	equals(path + "/dists/unstable/main/i18n/Translation-de", Translation[2]);
+	equals(path + "/dists/unstable/main/i18n/Translation-en", Translation[3]);
+	equals(path + "/.disk/", InfoDir);
+
+	cd.DropRepeats(Packages, "Packages");
+	cd.DropRepeats(Sources, "Sources");
+	_error->PushToStack();
+	cd.DropRepeats(Signatur, "InRelease");
+	cd.DropRepeats(Signatur, "Release.gpg");
+	_error->RevertToStack();
+	_error->DumpErrors();
+	cd.DropRepeats(Translation, "");
+
+	equals(3, Packages.size());
+	equals(path + "/dists/stable/contrib/binary-amd64/", Packages[0]);
+	equals(path + "/dists/stable/main/binary-i386/", Packages[1]);
+	equals(path + "/dists/unstable/main/binary-i386/", Packages[2]);
+	equals(2, Sources.size());
+	equals(path + "/dists/stable/main/source/", Sources[0]);
+	equals(path + "/dists/unstable/main/source/", Sources[1]);
+	equals(2, Signatur.size());
+	equals(path + "/dists/stable/", Signatur[0]);
+	equals(path + "/dists/unstable/", Signatur[1]);
+	equals(2, Translation.size());
+	equals(path + "/dists/unstable/main/i18n/Translation-de", Translation[0]);
+	equals(path + "/dists/unstable/main/i18n/Translation-en", Translation[1]);
+
+	return 0;
+}
diff --git a/test/libapt/configuration_test.cc b/test/libapt/configuration_test.cc
index 5b23d17fb..9a3e2c118 100644
--- a/test/libapt/configuration_test.cc
+++ b/test/libapt/configuration_test.cc
@@ -71,6 +71,15 @@ int main(int argc,const char *argv[]) {
 	equals(Cnf.Find("APT2::Version", "33"), "33");
 	equals(Cnf.FindI("APT2::Version", 33), 33);
 
+	equals(Cnf.FindFile("Dir::State"), "");
+	equals(Cnf.FindFile("Dir::Aptitude::State"), "");
+	Cnf.Set("Dir", "/srv/sid");
+	equals(Cnf.FindFile("Dir::State"), "");
+	Cnf.Set("Dir::State", "var/lib/apt");
+	Cnf.Set("Dir::Aptitude::State", "var/lib/aptitude");
+	equals(Cnf.FindFile("Dir::State"), "/srv/sid/var/lib/apt");
+	equals(Cnf.FindFile("Dir::Aptitude::State"), "/srv/sid/var/lib/aptitude");
+
 	//FIXME: Test for configuration file parsing;
 	// currently only integration/ tests test them implicitly
 
diff --git a/test/libapt/getlistoffilesindir_test.cc b/test/libapt/getlistoffilesindir_test.cc
index 5ee014cca..b2c95e840 100644
--- a/test/libapt/getlistoffilesindir_test.cc
+++ b/test/libapt/getlistoffilesindir_test.cc
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <iostream>
 
-#define P(x)	string(argv[1]).append("/").append(x)
+#define P(x)	std::string(argv[1]).append("/").append(x)
 
 int main(int argc,char *argv[])
 {
diff --git a/test/libapt/globalerror_test.cc b/test/libapt/globalerror_test.cc
index 5d27414f9..72044d493 100644
--- a/test/libapt/globalerror_test.cc
+++ b/test/libapt/globalerror_test.cc
@@ -3,9 +3,12 @@
 #include "assert.h"
 #include <string>
 #include <errno.h>
+#include <string.h>
 
 int main(int argc,char *argv[])
 {
+	std::string const textOfErrnoZero(strerror(0));
+
 	equals(_error->empty(), true);
 	equals(_error->PendingError(), false);
 	equals(_error->Notice("%s Notice", "A"), false);
@@ -80,7 +83,7 @@ int main(int argc,char *argv[])
 	equals(_error->PendingError(), true);
 	equals(_error->PopMessage(text), true);
 	equals(_error->PendingError(), false);
-	equals(text, "Something horrible happend 2 times - errno (0: Success)");
+	equals(text, std::string("Something horrible happend 2 times - errno (0: ").append(textOfErrnoZero).append(")"));
 	equals(_error->empty(), true);
 
 	std::string longText;
@@ -92,7 +95,7 @@ int main(int argc,char *argv[])
 
 	equals(_error->Errno("errno", "%s horrible %s %d times", longText.c_str(), "happend", 2), false);
 	equals(_error->PopMessage(text), true);
-	equals(text, std::string(longText).append(" horrible happend 2 times - errno (0: Success)"));
+	equals(text, std::string(longText).append(" horrible happend 2 times - errno (0: ").append(textOfErrnoZero).append(")"));
 
 	equals(_error->Warning("Репозиторий не обновлён и будут %d %s", 4, "test"), false);
 	equals(_error->PopMessage(text), false);
diff --git a/test/libapt/hashsums_test.cc b/test/libapt/hashsums_test.cc
new file mode 100644
index 000000000..396e4cf6b
--- /dev/null
+++ b/test/libapt/hashsums_test.cc
@@ -0,0 +1,156 @@
+#include <apt-pkg/md5.h>
+#include <apt-pkg/sha1.h>
+#include <apt-pkg/sha2.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/hashes.h>
+#include <iostream>
+
+#include <stdio.h>
+
+#include "assert.h"
+
+template <class T> void Test(const char *In,const char *Out)
+{
+   T Sum;
+   Sum.Add(In);
+   equals(Sum.Result().Value(), Out);
+}
+
+template <class T> void TestMill(const char *Out)
+{
+   T Sum;
+
+   const unsigned char As[] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+   unsigned Count = 1000000;
+   for (; Count != 0;)
+   {
+      if (Count >= 64)
+      {
+	 Sum.Add(As,64);
+	 Count -= 64;
+      }
+      else
+      {
+	 Sum.Add(As,Count);
+	 Count = 0;
+      }
+   }
+
+   if (stringcasecmp(Sum.Result().Value(), Out) != 0)
+      abort();
+}
+
+int main(int argc, char** argv)
+{
+   // From  FIPS PUB 180-1
+   Test<SHA1Summation>("","da39a3ee5e6b4b0d3255bfef95601890afd80709");
+   Test<SHA1Summation>("abc","a9993e364706816aba3e25717850c26c9cd0d89d");
+   Test<SHA1Summation>("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+		       "84983e441c3bd26ebaae4aa1f95129e5e54670f1");
+   TestMill<SHA1Summation>("34aa973cd4c4daa4f61eeb2bdbad27316534016f");
+
+   // MD5 tests from RFC 1321
+   Test<MD5Summation>("","d41d8cd98f00b204e9800998ecf8427e");
+   Test<MD5Summation>("a","0cc175b9c0f1b6a831c399e269772661");
+   Test<MD5Summation>("abc","900150983cd24fb0d6963f7d28e17f72");
+   Test<MD5Summation>("message digest","f96b697d7cb7938d525a2f31aaf161d0");
+   Test<MD5Summation>("abcdefghijklmnopqrstuvwxyz","c3fcd3d76192e4007dfb496cca67e13b");
+   Test<MD5Summation>("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+		      "d174ab98d277d9f5a5611c2c9f419d9f");
+   Test<MD5Summation>("12345678901234567890123456789012345678901234567890123456789012345678901234567890",
+		      "57edf4a22be3c955ac49da2e2107b67a");
+
+   // SHA-256, From FIPS 180-2
+   Test<SHA256Summation>("", "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855");
+   Test<SHA256Summation>("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+			 "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1");
+
+   // SHA-512
+   Test<SHA512Summation>("",
+	"cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce"
+	"47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e");
+   Test<SHA512Summation>(
+      "abc",
+      "ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a"
+      "2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f");
+
+
+   Test<MD5Summation>("The quick brown fox jumps over the lazy dog", "9e107d9d372bb6826bd81d3542a419d6");
+   Test<MD5Summation>("The quick brown fox jumps over the lazy dog.", "e4d909c290d0fb1ca068ffaddf22cbd0");
+   Test<SHA1Summation>("The quick brown fox jumps over the lazy dog", "2fd4e1c67a2d28fced849ee1bb76e7391b93eb12");
+   Test<SHA1Summation>("The quick brown fox jumps over the lazy cog", "de9f2c7fd25e1b3afad3e85a0bd17d9b100db4b3");
+   Test<SHA256Summation>("The quick brown fox jumps over the lazy dog", "d7a8fbb307d7809469ca9abcb0082e4f8d5651e46d3cdb762d02d0bf37c9e592");
+   Test<SHA256Summation>("The quick brown fox jumps over the lazy dog.", "ef537f25c895bfa782526529a9b63d97aa631564d5d789c2b765448c8635fb6c");
+   Test<SHA512Summation>("The quick brown fox jumps over the lazy dog", "07e547d9586f6a73f73fbac0435ed76951218fb7d0c8d788a309d785436bbb64"
+									"2e93a252a954f23912547d1e8a3b5ed6e1bfd7097821233fa0538f3db854fee6");
+   Test<SHA512Summation>("The quick brown fox jumps over the lazy dog.", "91ea1245f20d46ae9a037a989f54f1f790f0a47607eeb8a14d12890cea77a1bb"
+									 "c6c7ed9cf205e67b7f2b8fd4c7dfd3a7a8617e45f3c463d481c7e586c39ac1ed");
+
+   FILE* fd = fopen(argv[1], "r");
+   if (fd == NULL) {
+      std::cerr << "Can't open file for 1. testing: " << argv[1] << std::endl;
+      return 1;
+   }
+   {
+   Hashes hashes;
+   hashes.AddFD(fileno(fd));
+   equals(argv[2], hashes.MD5.Result().Value());
+   equals(argv[3], hashes.SHA1.Result().Value());
+   equals(argv[4], hashes.SHA256.Result().Value());
+   equals(argv[5], hashes.SHA512.Result().Value());
+   }
+   fseek(fd, 0L, SEEK_END);
+   unsigned long sz = ftell(fd);
+   fseek(fd, 0L, SEEK_SET);
+   {
+   Hashes hashes;
+   hashes.AddFD(fileno(fd), sz);
+   equals(argv[2], hashes.MD5.Result().Value());
+   equals(argv[3], hashes.SHA1.Result().Value());
+   equals(argv[4], hashes.SHA256.Result().Value());
+   equals(argv[5], hashes.SHA512.Result().Value());
+   }
+   fseek(fd, 0L, SEEK_SET);
+   {
+   MD5Summation md5;
+   md5.AddFD(fileno(fd));
+   equals(argv[2], md5.Result().Value());
+   }
+   fseek(fd, 0L, SEEK_SET);
+   {
+   SHA1Summation sha1;
+   sha1.AddFD(fileno(fd));
+   equals(argv[3], sha1.Result().Value());
+   }
+   fseek(fd, 0L, SEEK_SET);
+   {
+   SHA256Summation sha2;
+   sha2.AddFD(fileno(fd));
+   equals(argv[4], sha2.Result().Value());
+   }
+   fseek(fd, 0L, SEEK_SET);
+   {
+   SHA512Summation sha2;
+   sha2.AddFD(fileno(fd));
+   equals(argv[5], sha2.Result().Value());
+   }
+   fclose(fd);
+
+   // test HashString code
+   {
+   HashString sha2("SHA256", argv[4]);
+   equals(sha2.VerifyFile(argv[1]), true);
+   }
+   {
+   HashString sha2("SHA512", argv[5]);
+   equals(sha2.VerifyFile(argv[1]), true);
+   }
+   {
+   HashString sha2("SHA256:" + std::string(argv[4]));
+   equals(sha2.VerifyFile(argv[1]), true);
+   }
+
+   return 0;
+}
+
+
diff --git a/test/libapt/makefile b/test/libapt/makefile
index b3f2f4274..1952051e2 100644
--- a/test/libapt/makefile
+++ b/test/libapt/makefile
@@ -51,6 +51,12 @@ SLIBS = -lapt-pkg
 SOURCE = globalerror_test.cc
 include $(PROGRAM_H)
 
+# test the different Hashsum classes
+PROGRAM = HashSums${BASENAME}
+SLIBS = -lapt-pkg
+SOURCE = hashsums_test.cc
+include $(PROGRAM_H)
+
 # test the strutils stuff
 PROGRAM = StrUtil${BASENAME}
 SLIBS = -lapt-pkg
@@ -68,3 +74,9 @@ PROGRAM = Configuration${BASENAME}
 SLIBS = -lapt-pkg
 SOURCE = configuration_test.cc
 include $(PROGRAM_H)
+
+# test cdroms core FindPackages
+PROGRAM = CdromFindPackages${BASENAME}
+SLIBS = -lapt-pkg
+SOURCE = cdromfindpackages_test.cc
+include $(PROGRAM_H)
diff --git a/test/libapt/parsedepends_test.cc b/test/libapt/parsedepends_test.cc
index 7b496878d..b5d92d9d2 100644
--- a/test/libapt/parsedepends_test.cc
+++ b/test/libapt/parsedepends_test.cc
@@ -4,8 +4,8 @@
 #include "assert.h"
 
 int main(int argc,char *argv[]) {
-	string Package;
-	string Version;
+	std::string Package;
+	std::string Version;
 	unsigned int Op = 5;
 	unsigned int Null = 0;
 	bool StripMultiArch = true;
diff --git a/test/libapt/run-tests b/test/libapt/run-tests
index 9dad36f5b..4ea9a916d 100755
--- a/test/libapt/run-tests
+++ b/test/libapt/run-tests
@@ -66,8 +66,42 @@ do
 			"${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-se~" \
 			"${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-st.bak" \
 			"${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-ast_DE"
+	elif [ $name = "HashSums${EXT}" ]; then
+		TMP="$(readlink -f "./${0}")"
+		echo -n "Testing with ${NAME} "
+		LD_LIBRARY_PATH=${LDPATH} ${testapp} $TMP $(md5sum $TMP | cut -d' ' -f 1) $(sha1sum $TMP | cut -d' ' -f 1) $(sha256sum $TMP | cut -d' ' -f 1) $(sha512sum $TMP | cut -d' ' -f 1) && echo "$TESTOKAY" || echo "$TESTFAIL"
+		continue
 	elif [ $name = "CompareVersion${EXT}" ]; then
 		tmppath="${DIR}/versions.lst"
+	elif [ $name = "CdromFindPackages${EXT}" ]; then
+		tmppath=$(mktemp -d)
+		mkdir -p "${tmppath}/.disk" "${tmppath}/pool" \
+			"${tmppath}/dists/stable/main/binary-i386" \
+			"${tmppath}/dists/stable/main/source" \
+			"${tmppath}/dists/stable/contrib/binary-amd64" \
+			"${tmppath}/dists/stable/contrib/binary-all" \
+			"${tmppath}/dists/unstable/main/binary-i386" \
+			"${tmppath}/dists/unstable/main/i18n" \
+			"${tmppath}/dists/unstable/main/source" \
+			"${tmppath}/dists/broken/non-free/source"
+		touch "${tmppath}/dists/broken/.aptignr" \
+			"${tmppath}/dists/stable/main/binary-i386/Packages" \
+			"${tmppath}/dists/stable/main/binary-i386/Packages.bz2" \
+			"${tmppath}/dists/stable/main/source/Sources.xz" \
+			"${tmppath}/dists/stable/contrib/binary-amd64/Packages" \
+			"${tmppath}/dists/stable/contrib/binary-amd64/Packages.gz" \
+			"${tmppath}/dists/stable/contrib/binary-all/Packages" \
+			"${tmppath}/dists/unstable/main/binary-i386/Packages.xz" \
+			"${tmppath}/dists/unstable/main/binary-i386/Packages.lzma" \
+			"${tmppath}/dists/unstable/main/i18n/Translation-en" \
+			"${tmppath}/dists/unstable/main/i18n/Translation-de.bz2" \
+			"${tmppath}/dists/unstable/main/source/Sources.xz" \
+			"${tmppath}/dists/broken/non-free/source/Sources.gz" \
+			"${tmppath}/dists/stable/Release.gpg" \
+			"${tmppath}/dists/stable/Release" \
+			"${tmppath}/dists/unstable/InRelease" \
+			"${tmppath}/dists/broken/Release.gpg"
+		ln -s "${tmppath}/dists/unstable" "${tmppath}/dists/sid"
 	fi
 
 	echo -n "Testing with ${NAME} "
@@ -76,5 +110,4 @@ do
 	if [ -n "$tmppath" -a -d "$tmppath" ]; then
 		rm -rf "$tmppath"
 	fi
-
 done
diff --git a/test/libapt/strutil_test.cc b/test/libapt/strutil_test.cc
index af6eb2cc6..bfe0d7222 100644
--- a/test/libapt/strutil_test.cc
+++ b/test/libapt/strutil_test.cc
@@ -4,7 +4,7 @@
 
 int main(int argc,char *argv[])
 {
-   string input, output, expected;
+   std::string input, output, expected;
 
    // no input
    input = "foobar";